summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2008-04-12 12:49:29 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2008-04-12 12:49:29 +0000
commit55b7ceed0ca2cd9984cd3d2a58ae84439a3510f0 (patch)
treeda79f888feb519f98c27a7c3424b4c9266827293 /sys/arch/i386
parent93de1ab6042ecbf745ff778bc42998c0ef836f5e (diff)
Get rid of acpi_s5 global variables; simply send SIGUSR2 instead of SUGUSR1
to tell init(8) to power down the machine. ok krw@
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/i386/machdep.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index bcf7ce29dd4..6fbc22adb49 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.421 2008/04/09 16:58:10 deraadt Exp $ */
+/* $OpenBSD: machdep.c,v 1.422 2008/04/12 12:49:28 kettenis Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -2407,11 +2407,11 @@ haltsys:
if (howto & RB_HALT) {
#if NACPI > 0 && !defined(SMALL_KERNEL)
- extern int acpi_s5, acpi_enabled;
+ extern int acpi_enabled;
if (acpi_enabled) {
delay(500000);
- if ((howto & RB_POWERDOWN) || acpi_s5)
+ if (howto & RB_POWERDOWN)
acpi_powerdown();
}
#endif