summaryrefslogtreecommitdiff
path: root/sys/arch/amd64
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2010-10-02 23:31:35 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2010-10-02 23:31:35 +0000
commit4c1e959777802a68194431ffe5cdc15f539de132 (patch)
tree269033fd7807f11a69c69c31e9b98b1c33ad1e34 /sys/arch/amd64
parent5f350d1fcac52f90c3748e7e05cf6ec11f50bc74 (diff)
turn off lid suspend if we doing halt -p
ok kettenis marco miod
Diffstat (limited to 'sys/arch/amd64')
-rw-r--r--sys/arch/amd64/amd64/machdep.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c
index 0b7d99e162b..46d8724262b 100644
--- a/sys/arch/amd64/amd64/machdep.c
+++ b/sys/arch/amd64/amd64/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.123 2010/10/02 23:30:39 deraadt Exp $ */
+/* $OpenBSD: machdep.c,v 1.124 2010/10/02 23:31:33 deraadt Exp $ */
/* $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */
/*-
@@ -717,6 +717,8 @@ struct pcb dumppcb;
void
boot(int howto)
{
+ if (howto & RB_POWERDOWN)
+ lid_suspend = 0;
if (cold) {
/*