diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2017-08-12 13:18:49 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2017-08-12 13:18:49 +0000 |
| commit | f89d333c234ee914febf2481df997dd9112dbf85 (patch) | |
| tree | 2e638fbef459268e1d96172696110c2ac2c5352b /sys/arch | |
| parent | 389d1e4942cc77948c1ec0c0d3d3a2a659a7c14e (diff) | |
remove apmwarn sysctl which is not used
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/arm/arm/arm32_machdep.c | 10 | ||||
| -rw-r--r-- | sys/arch/arm/include/cpu.h | 6 |
2 files changed, 4 insertions, 12 deletions
diff --git a/sys/arch/arm/arm/arm32_machdep.c b/sys/arch/arm/arm/arm32_machdep.c index 44ae69fa7f9..2eb86cded27 100644 --- a/sys/arch/arm/arm/arm32_machdep.c +++ b/sys/arch/arm/arm/arm32_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: arm32_machdep.c,v 1.53 2017/01/13 09:18:11 fcambus Exp $ */ +/* $OpenBSD: arm32_machdep.c,v 1.54 2017/08/12 13:18:48 tedu Exp $ */ /* $NetBSD: arm32_machdep.c,v 1.42 2003/12/30 12:33:15 pk Exp $ */ /* @@ -303,9 +303,6 @@ int cpu_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, size_t newlen, struct proc *p) { -#if NAPM > 0 - extern int cpu_apmwarn; -#endif /* all sysctl names at this level are terminal */ if (namelen != 1) @@ -334,11 +331,6 @@ cpu_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, return (sysctl_rdint(oldp, oldlenp, newp, 0)); #endif -#if NAPM > 0 - case CPU_APMWARN: - return (sysctl_int(oldp, oldlenp, newp, newlen, &cpu_apmwarn)); -#endif - default: return (EOPNOTSUPP); } diff --git a/sys/arch/arm/include/cpu.h b/sys/arch/arm/include/cpu.h index 0477b88883f..12df5df0146 100644 --- a/sys/arch/arm/include/cpu.h +++ b/sys/arch/arm/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.47 2017/07/12 06:26:32 natano Exp $ */ +/* $OpenBSD: cpu.h,v 1.48 2017/08/12 13:18:48 tedu Exp $ */ /* $NetBSD: cpu.h,v 1.34 2003/06/23 11:01:08 martin Exp $ */ /* @@ -60,7 +60,7 @@ #define CPU_CONSDEV 4 /* struct: dev_t of our console */ #define CPU_POWERSAVE 5 /* int: use CPU powersave mode */ #define CPU_ALLOWAPERTURE 6 /* int: allow mmap of /dev/xf86 */ -#define CPU_APMWARN 7 /* APM battery warning percentage */ + /* 7 formerly int: apmwarn */ /* 8 formerly int: keyboard reset */ /* 9 formerly int: CPU_ZTSRAWMODE */ /* 10 formerly struct: CPU_ZTSSCALE */ @@ -77,7 +77,7 @@ { "console_device", CTLTYPE_STRUCT }, \ { "powersave", CTLTYPE_INT }, \ { "allowaperture", CTLTYPE_INT }, \ - { "apmwarn", CTLTYPE_INT }, \ + { 0, 0 }, \ { 0, 0 }, \ { 0, 0 }, \ { 0, 0 }, \ |