summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2014-05-31 15:49:29 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2014-05-31 15:49:29 +0000
commita835ef0dc75c1324c302b0d40c18b274f3e174c7 (patch)
tree22188c12effe924558933baa4cc67671a4bf4ca8 /sys/arch/i386
parent1aaf3db45a67e7a69d7549ded06c8433dfae0995 (diff)
Revert previous diff setting cold to 1 on shutdown because it breaks machine
with softraid(4) disks. softraid(4) is the last real consumer of the doshutdownhooks(9) API and it is not trivial to convert its hook to a DVACT_POWERDOWN handler since the latter does not allow to sleep.
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/i386/machdep.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 59c5adeb2cc..fe8df0f45bb 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.537 2014/05/30 13:46:16 mpi Exp $ */
+/* $OpenBSD: machdep.c,v 1.538 2014/05/31 15:49:28 mpi Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -2597,7 +2597,6 @@ boot(int howto)
uvm_shutdown();
splhigh(); /* Disable interrupts. */
- cold = 1;
/* Do a dump if requested. */
if (howto & RB_DUMP)