diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2014-05-31 15:49:29 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2014-05-31 15:49:29 +0000 |
| commit | a835ef0dc75c1324c302b0d40c18b274f3e174c7 (patch) | |
| tree | 22188c12effe924558933baa4cc67671a4bf4ca8 /sys/arch/armish | |
| parent | 1aaf3db45a67e7a69d7549ded06c8433dfae0995 (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/armish')
| -rw-r--r-- | sys/arch/armish/armish/armish_machdep.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/armish/armish/armish_machdep.c b/sys/arch/armish/armish/armish_machdep.c index e408d0d5789..6d03ae132b4 100644 --- a/sys/arch/armish/armish/armish_machdep.c +++ b/sys/arch/armish/armish/armish_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: armish_machdep.c,v 1.24 2014/05/30 13:46:16 mpi Exp $ */ +/* $OpenBSD: armish_machdep.c,v 1.25 2014/05/31 15:49:28 mpi Exp $ */ /* $NetBSD: lubbock_machdep.c,v 1.2 2003/07/15 00:25:06 lukem Exp $ */ /* @@ -274,8 +274,9 @@ boot(int howto) if_downall(); uvm_shutdown(); - splhigh(); /* Disable interrupts. */ - cold = 1; + + /* Say NO to interrupts */ + splhigh(); /* Do a dump if requested. */ if ((howto & (RB_DUMP | RB_HALT)) == RB_DUMP) |