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/sparc64/include | |
| 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/sparc64/include')
| -rw-r--r-- | sys/arch/sparc64/include/cpu.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/sparc64/include/cpu.h b/sys/arch/sparc64/include/cpu.h index dbe6b079dd6..eb7dcd75ba0 100644 --- a/sys/arch/sparc64/include/cpu.h +++ b/sys/arch/sparc64/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.76 2011/03/23 16:54:37 pirofti Exp $ */ +/* $OpenBSD: cpu.h,v 1.77 2011/06/24 19:47:49 naddy Exp $ */ /* $NetBSD: cpu.h,v 1.28 2001/06/14 22:56:58 thorpej Exp $ */ /* @@ -47,12 +47,13 @@ /* * CTL_MACHDEP definitions. */ + /* 1 formerly: booted kernel name */ #define CPU_LED_BLINK 2 /* int: blink leds? */ #define CPU_ALLOWAPERTURE 3 /* allow xf86 operations */ #define CPU_CPUTYPE 4 /* cpu type */ #define CPU_CECCERRORS 5 /* Correctable ECC errors */ #define CPU_CECCLAST 6 /* Correctable ECC last fault addr */ -#define CPU_KBDRESET 7 /* soft reset via keyboard */ + /* 7 formerly: soft reset via keyboard */ #define CPU_MAXID 8 /* number of valid machdep ids */ #define CTL_MACHDEP_NAMES { \ @@ -63,7 +64,7 @@ { "cputype", CTLTYPE_INT }, \ { "ceccerrs", CTLTYPE_INT }, \ { "cecclast", CTLTYPE_QUAD }, \ - { "kbdreset", CTLTYPE_INT }, \ + { 0, 0 }, \ } #ifdef _KERNEL |