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/octeon | |
| 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/octeon')
| -rw-r--r-- | sys/arch/octeon/octeon/machdep.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/arch/octeon/octeon/machdep.c b/sys/arch/octeon/octeon/machdep.c index 94d784570ea..15be8b47893 100644 --- a/sys/arch/octeon/octeon/machdep.c +++ b/sys/arch/octeon/octeon/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.47 2014/05/30 13:46:16 mpi Exp $ */ +/* $OpenBSD: machdep.c,v 1.48 2014/05/31 15:49:28 mpi Exp $ */ /* * Copyright (c) 2009, 2010 Miodrag Vallat. @@ -687,8 +687,7 @@ boot(int howto) if_downall(); uvm_shutdown(); - splhigh(); /* Disable interrupts. */ - cold = 1; + (void) splhigh(); /* Extreme priority. */ if (howto & RB_DUMP) dumpsys(); |