diff options
| author | Christian Weisgerber <naddy@cvs.openbsd.org> | 2011-06-24 19:47:50 +0000 |
|---|---|---|
| committer | Christian Weisgerber <naddy@cvs.openbsd.org> | 2011-06-24 19:47:50 +0000 |
| commit | 3da505965757e4e925366c29b363105405fd202d (patch) | |
| tree | 3bd93b0681c5ada7d7dac32ec4fcd54b6063055f /sys/arch/octeon | |
| parent | 7f1ea65fed8697f18acb9a18feab7940904e5e80 (diff) | |
machdep.kbdreset enables a shutdown by Ctrl-Alt-Del on amd64 and
i386. Stop abusing it on other archs for controling a shutdown by
pressing the soft power button:
* Add a MI sysctl hw.allowpowerdown; if set to 1 (the default) it
allows a power button shutdown.
* Make acpi(4)/acpibtn(4) honor hw.allowpowerdown.
* Switch the various power button intercepts on landisk, sgi, sparc64
and zaurus over to hw.allowpowerdown.
* Garbage collect the machdep.kbdreset sysctl on all archs other than
amd64 and i386.
ok miod@
Diffstat (limited to 'sys/arch/octeon')
| -rw-r--r-- | sys/arch/octeon/octeon/machdep.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/arch/octeon/octeon/machdep.c b/sys/arch/octeon/octeon/machdep.c index ac4bc21ea6b..b059e904fac 100644 --- a/sys/arch/octeon/octeon/machdep.c +++ b/sys/arch/octeon/octeon/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.13 2011/06/05 19:41:07 deraadt Exp $ */ +/* $OpenBSD: machdep.c,v 1.14 2011/06/24 19:47:48 naddy Exp $ */ /* * Copyright (c) 2009, 2010 Miodrag Vallat. @@ -176,7 +176,6 @@ vaddr_t uncached_base; int physmem; /* Max supported memory, changes to actual. */ int ncpu = 1; /* At least one CPU in the system. */ struct user *proc0paddr; -int kbd_reset; struct cpu_hwinfo bootcpu_hwinfo; @@ -630,10 +629,6 @@ cpu_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p) return ENOTDIR; /* Overloaded */ switch (name[0]) { - case CPU_KBDRESET: - if (securelevel > 0) - return (sysctl_rdint(oldp, oldlenp, newp, kbd_reset)); - return (sysctl_int(oldp, oldlenp, newp, newlen, &kbd_reset)); default: return EOPNOTSUPP; } |