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/sgi/dev | |
| 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/sgi/dev')
| -rw-r--r-- | sys/arch/sgi/dev/power.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/sgi/dev/power.c b/sys/arch/sgi/dev/power.c index 3696db748f5..ed8350a51c8 100644 --- a/sys/arch/sgi/dev/power.c +++ b/sys/arch/sgi/dev/power.c @@ -1,4 +1,4 @@ -/* $OpenBSD: power.c,v 1.13 2009/11/25 11:23:29 miod Exp $ */ +/* $OpenBSD: power.c,v 1.14 2011/06/24 19:47:49 naddy Exp $ */ /* * Copyright (c) 2007 Jasper Lievisse Adriaanse <jasper@openbsd.org> @@ -126,7 +126,7 @@ power_mainbus_intr(void *v) int power_intr(void *unused) { - extern int kbd_reset; + extern int allowpowerdown; int val; /* @@ -140,8 +140,8 @@ power_intr(void *unused) /* debounce condition */ dsrtc_register_write(DS1687_EXT_CTRL, val & ~DS1687_KICKSTART); - if (kbd_reset == 1) { - kbd_reset = 0; + if (allowpowerdown == 1) { + allowpowerdown = 0; psignal(initproc, SIGUSR2); } |