diff options
| author | Martin Natano <natano@cvs.openbsd.org> | 2017-07-12 06:26:34 +0000 |
|---|---|---|
| committer | Martin Natano <natano@cvs.openbsd.org> | 2017-07-12 06:26:34 +0000 |
| commit | bef770797c339ea6d81910ab41ea6c098c3700d2 (patch) | |
| tree | 3ab583d4494e6d4dd3d59b4bf4024af10d308540 /sys/arch/i386 | |
| parent | ec96b9a29bfe4ade999dfd5962fc51c949e9e686 (diff) | |
remove CPU_LIDSUSPEND/machdep.lidsuspend
"fire away!" tedu
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/i386/machdep.c | 3 | ||||
| -rw-r--r-- | sys/arch/i386/include/cpu.h | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index 78abb6f6215..99023b9d86c 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.603 2017/06/29 07:11:24 mlarkin Exp $ */ +/* $OpenBSD: machdep.c,v 1.604 2017/07/12 06:26:32 natano Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -3550,7 +3550,6 @@ cpu_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, return (sysctl_rdint(oldp, oldlenp, newp, i386_has_sse2)); case CPU_XCRYPT: return (sysctl_rdint(oldp, oldlenp, newp, i386_has_xcrypt)); - case CPU_LIDSUSPEND: case CPU_LIDACTION: val = lid_action; error = sysctl_int(oldp, oldlenp, newp, newlen, &val); diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h index bb3f1c8628a..677fcb7f6b6 100644 --- a/sys/arch/i386/include/cpu.h +++ b/sys/arch/i386/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.155 2017/03/16 10:02:03 mpi Exp $ */ +/* $OpenBSD: cpu.h,v 1.156 2017/07/12 06:26:33 natano Exp $ */ /* $NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $ */ /*- @@ -523,7 +523,6 @@ int cpu_paenable(void *); #define CPU_SSE 14 /* supports SSE */ #define CPU_SSE2 15 /* supports SSE2 */ #define CPU_XCRYPT 16 /* supports VIA xcrypt in userland */ -#define CPU_LIDSUSPEND 17 /* lid close causes a suspend */ #define CPU_LIDACTION 18 /* action caused by lid close */ #define CPU_FORCEUKBD 19 /* Force ukbd(4) as console keyboard */ #define CPU_MAXID 20 /* number of valid machdep ids */ @@ -546,7 +545,7 @@ int cpu_paenable(void *); { "sse", CTLTYPE_INT }, \ { "sse2", CTLTYPE_INT }, \ { "xcrypt", CTLTYPE_INT }, \ - { "lidsuspend", CTLTYPE_INT }, \ + { 0, 0 }, \ { "lidaction", CTLTYPE_INT }, \ { "forceukbd", CTLTYPE_INT }, \ } |