summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authortedu <tedu@openbsd.org>2017-08-11 20:19:14 +0000
committertedu <tedu@openbsd.org>2017-08-11 20:19:14 +0000
commit27b92d834324d16b4e3f428f92058e62b4ca4894 (patch)
tree988b285da398dcadfc2bc5304b842dd28c6d3ae2 /sys
parentRewrite EllipticCurves TLS extension handling using CBB/CBS and the new (diff)
downloadwireguard-openbsd-27b92d834324d16b4e3f428f92058e62b4ca4894.tar.xz
wireguard-openbsd-27b92d834324d16b4e3f428f92058e62b4ca4894.zip
apmwarn and the ridiculous apmhalt hack sysctls are not relevant here
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amd64/include/cpu.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/arch/amd64/include/cpu.h b/sys/arch/amd64/include/cpu.h
index a7e26294f96..37e2b490eec 100644
--- a/sys/arch/amd64/include/cpu.h
+++ b/sys/arch/amd64/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.113 2017/07/12 06:26:32 natano Exp $ */
+/* $OpenBSD: cpu.h,v 1.114 2017/08/11 20:19:14 tedu Exp $ */
/* $NetBSD: cpu.h,v 1.1 2003/04/26 18:39:39 fvdl Exp $ */
/*-
@@ -423,9 +423,7 @@ void mp_setperf_init(void);
#define CPU_CPUVENDOR 6 /* cpuid vendor string */
#define CPU_CPUID 7 /* cpuid */
#define CPU_CPUFEATURE 8 /* cpuid features */
-#define CPU_APMWARN 9 /* APM battery warning percentage */
#define CPU_KBDRESET 10 /* keyboard reset under pcvt */
-#define CPU_APMHALT 11 /* halt -p hack */
#define CPU_XCRYPT 12 /* supports VIA xcrypt in userland */
#define CPU_LIDACTION 14 /* action caused by lid close */
#define CPU_FORCEUKBD 15 /* Force ukbd(4) as console keyboard */
@@ -441,9 +439,9 @@ void mp_setperf_init(void);
{ "cpuvendor", CTLTYPE_STRING }, \
{ "cpuid", CTLTYPE_INT }, \
{ "cpufeature", CTLTYPE_INT }, \
- { "apmwarn", CTLTYPE_INT }, \
+ { 0, 0 }, \
{ "kbdreset", CTLTYPE_INT }, \
- { "apmhalt", CTLTYPE_INT }, \
+ { 0, 0 }, \
{ "xcrypt", CTLTYPE_INT }, \
{ 0, 0 }, \
{ "lidaction", CTLTYPE_INT }, \