diff options
| author |   mpi <mpi@openbsd.org> | 2014-05-31 15:49:28 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2014-05-31 15:49:28 +0000 |
| commit | 5a973a70a7b16941bb91da260c9969a96e142d65 (patch) | |
| tree | ffb1c6b365504af19c50f43c2b894b2c31ab9390 /sys/arch/sparc | |
| parent | Unbreak RTM_CHANGE. Unlike RTM_LOCK or RTM_GET it is OK to pass in a (diff) | |
| download | wireguard-openbsd-5a973a70a7b16941bb91da260c9969a96e142d65.tar.xz wireguard-openbsd-5a973a70a7b16941bb91da260c9969a96e142d65.zip | |
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/sparc')
| -rw-r--r-- | sys/arch/sparc/sparc/machdep.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c index babc7192609..b6148d6a6fe 100644 --- a/sys/arch/sparc/sparc/machdep.c +++ b/sys/arch/sparc/sparc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.153 2014/05/30 13:46:16 mpi Exp $ */ +/* $OpenBSD: machdep.c,v 1.154 2014/05/31 15:49:28 mpi Exp $ */ /* $NetBSD: machdep.c,v 1.85 1997/09/12 08:55:02 pk Exp $ */ /* @@ -563,8 +563,7 @@ boot(howto) if_downall(); uvm_shutdown(); - splhigh(); /* Disable interrupts. */ - cold = 1; + (void) splhigh(); /* ??? */ if (howto & RB_DUMP) dumpsys(); |