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.

diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c
index bc26eca..2389032 100644 (file)
--- a/sys/arch/alpha/alpha/machdep.c
+++ b/sys/arch/alpha/alpha/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.155 2014/05/30 13:46:16 mpi Exp $ */
+/* $OpenBSD: machdep.c,v 1.156 2014/05/31 15:49:28 mpi Exp $ */
 /* $NetBSD: machdep.c,v 1.210 2000/06/01 17:12:38 thorpej Exp $ */
 
 /*-
@@ -1015,7 +1015,6 @@ boot(howto)
 
        uvm_shutdown();
        splhigh();              /* Disable interrupts. */
-       cold = 1;
 
 #if defined(MULTIPROCESSOR)
        /*

diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c
index 947287c..b4fb77e 100644 (file)
--- a/sys/arch/amd64/amd64/machdep.c
+++ b/sys/arch/amd64/amd64/machdep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: machdep.c,v 1.178 2014/05/30 13:46:16 mpi Exp $       */
+/*     $OpenBSD: machdep.c,v 1.179 2014/05/31 15:49:28 mpi Exp $       */
 /*     $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */
 
 /*-
@@ -783,7 +783,6 @@ boot(int howto)
 
        uvm_shutdown();
        splhigh();              /* Disable interrupts. */
-       cold = 1;
 
        /* Do a dump if requested. */
        if (howto & RB_DUMP)

diff --git a/sys/arch/armish/armish/armish_machdep.c b/sys/arch/armish/armish/armish_machdep.c
index e408d0d..6d03ae1 100644 (file)
--- 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)

diff --git a/sys/arch/armv7/armv7/armv7_machdep.c b/sys/arch/armv7/armv7/armv7_machdep.c
index ff6d657..98afd02 100644 (file)
--- a/sys/arch/armv7/armv7/armv7_machdep.c
+++ b/sys/arch/armv7/armv7/armv7_machdep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: armv7_machdep.c,v 1.7 2014/05/30 13:46:16 mpi Exp $ */
+/*     $OpenBSD: armv7_machdep.c,v 1.8 2014/05/31 15:49:28 mpi Exp $ */
 /*     $NetBSD: lubbock_machdep.c,v 1.2 2003/07/15 00:25:06 lukem Exp $ */
 
 /*
@@ -290,8 +290,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)

diff --git a/sys/arch/aviion/aviion/machdep.c b/sys/arch/aviion/aviion/machdep.c
index dd5672b..86e6dac 100644 (file)
--- a/sys/arch/aviion/aviion/machdep.c
+++ b/sys/arch/aviion/aviion/machdep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: machdep.c,v 1.63 2014/05/30 13:46:16 mpi Exp $        */
+/*     $OpenBSD: machdep.c,v 1.64 2014/05/31 15:49:28 mpi Exp $        */
 /*
  * Copyright (c) 2007 Miodrag Vallat.
  *
@@ -326,7 +326,6 @@ boot(howto)
 
        uvm_shutdown();
        splhigh();              /* Disable interrupts. */
-       cold = 1;
 
        /* If rebooting and a dump is requested, do it. */
        if (howto & RB_DUMP)

diff --git a/sys/arch/hppa/hppa/machdep.c b/sys/arch/hppa/hppa/machdep.c
index d1888df..6dab4a6 100644 (file)
--- a/sys/arch/hppa/hppa/machdep.c
+++ b/sys/arch/hppa/hppa/machdep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: machdep.c,v 1.221 2014/05/30 13:46:16 mpi Exp $       */
+/*     $OpenBSD: machdep.c,v 1.222 2014/05/31 15:49:28 mpi Exp $       */
 
 /*
  * Copyright (c) 1999-2003 Michael Shalayeff
@@ -925,9 +925,10 @@ boot(int howto)
        }
        if_downall();
 
+       /* XXX probably save howto into stable storage */
+
        uvm_shutdown();
        splhigh();
-       cold = 1;
 
        if (howto & RB_DUMP)
                dumpsys();

diff --git a/sys/arch/hppa64/hppa64/machdep.c b/sys/arch/hppa64/hppa64/machdep.c
index 10941b7..7987ff6 100644 (file)
--- a/sys/arch/hppa64/hppa64/machdep.c
+++ b/sys/arch/hppa64/hppa64/machdep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: machdep.c,v 1.59 2014/05/30 13:46:16 mpi Exp $        */
+/*     $OpenBSD: machdep.c,v 1.60 2014/05/31 15:49:28 mpi Exp $        */
 
 /*
  * Copyright (c) 2005 Michael Shalayeff
@@ -562,9 +562,10 @@ boot(int howto)
        }
        if_downall();
 
+       /* XXX probably save howto into stable storage */
+
        uvm_shutdown();
        splhigh();
-       cold = 1;
 
        if (howto & RB_DUMP)
                dumpsys();

diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 59c5ade..fe8df0f 100644 (file)
--- 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)

diff --git a/sys/arch/landisk/landisk/machdep.c b/sys/arch/landisk/landisk/machdep.c
index 77e4a53..02dbdee 100644 (file)
--- a/sys/arch/landisk/landisk/machdep.c
+++ b/sys/arch/landisk/landisk/machdep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: machdep.c,v 1.32 2014/05/30 13:46:16 mpi Exp $        */
+/*     $OpenBSD: machdep.c,v 1.33 2014/05/31 15:49:28 mpi Exp $        */
 /*     $NetBSD: machdep.c,v 1.1 2006/09/01 21:26:18 uwe Exp $  */
 
 /*-
@@ -217,7 +217,6 @@ boot(int howto)
 
        uvm_shutdown();
        splhigh();              /* Disable interrupts. */
-       cold = 1;
 
        /* Do a dump if requested. */
        if (howto & RB_DUMP)

diff --git a/sys/arch/loongson/loongson/machdep.c b/sys/arch/loongson/loongson/machdep.c
index f461089..87b7098 100644 (file)
--- a/sys/arch/loongson/loongson/machdep.c
+++ b/sys/arch/loongson/loongson/machdep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: machdep.c,v 1.48 2014/05/30 13:46:16 mpi Exp $ */
+/*     $OpenBSD: machdep.c,v 1.49 2014/05/31 15:49:28 mpi Exp $ */
 
 /*
  * Copyright (c) 2009, 2010, 2014 Miodrag Vallat.
@@ -943,8 +943,7 @@ boot(int howto)
        if_downall();
 
        uvm_shutdown();
-       splhigh();              /* Disable interrupts. */
-       cold = 1;
+       (void) splhigh();               /* Extreme priority. */
 
        if (howto & RB_DUMP)
                dumpsys();

diff --git a/sys/arch/luna88k/luna88k/machdep.c b/sys/arch/luna88k/luna88k/machdep.c
index 4ecd182..2ac7ef3 100644 (file)
--- a/sys/arch/luna88k/luna88k/machdep.c
+++ b/sys/arch/luna88k/luna88k/machdep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: machdep.c,v 1.99 2014/05/30 13:46:16 mpi Exp $        */
+/*     $OpenBSD: machdep.c,v 1.100 2014/05/31 15:49:28 mpi Exp $       */
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -500,7 +500,6 @@ boot(howto)
 
        uvm_shutdown();
        splhigh();                      /* Disable interrupts. */
-       cold = 1;
 
        /* If rebooting and a dump is requested, do it. */
        if (howto & RB_DUMP)

diff --git a/sys/arch/macppc/macppc/machdep.c b/sys/arch/macppc/macppc/machdep.c
index 9274726..054a937 100644 (file)
--- a/sys/arch/macppc/macppc/machdep.c
+++ b/sys/arch/macppc/macppc/machdep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: machdep.c,v 1.151 2014/05/30 13:46:16 mpi Exp $       */
+/*     $OpenBSD: machdep.c,v 1.152 2014/05/31 15:49:28 mpi Exp $       */
 /*     $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $   */
 
 /*
@@ -835,7 +835,6 @@ boot(int howto)
 
        uvm_shutdown();
        splhigh();
-       cold = 1;
 
        if (howto & RB_DUMP)
                dumpsys();

diff --git a/sys/arch/octeon/octeon/machdep.c b/sys/arch/octeon/octeon/machdep.c
index 94d7845..15be8b4 100644 (file)
--- 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();

diff --git a/sys/arch/sgi/sgi/machdep.c b/sys/arch/sgi/sgi/machdep.c
index 5747848..08bdbb1 100644 (file)
--- a/sys/arch/sgi/sgi/machdep.c
+++ b/sys/arch/sgi/sgi/machdep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: machdep.c,v 1.139 2014/05/30 13:46:16 mpi Exp $ */
+/*     $OpenBSD: machdep.c,v 1.140 2014/05/31 15:49:28 mpi Exp $ */
 
 /*
  * Copyright (c) 2003-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -870,8 +870,7 @@ boot(int howto)
        if_downall();
 
        uvm_shutdown();
-       splhigh();              /* Disable interrupts. */
-       cold = 1;
+       (void) splhigh();               /* Extreme priority. */
 
        if (howto & RB_DUMP)
                dumpsys();

diff --git a/sys/arch/socppc/socppc/machdep.c b/sys/arch/socppc/socppc/machdep.c
index 803a5c9..2d52a1d 100644 (file)
--- a/sys/arch/socppc/socppc/machdep.c
+++ b/sys/arch/socppc/socppc/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 $        */
 /*     $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $   */
 
 /*
@@ -1064,7 +1064,6 @@ boot(int howto)
 
        uvm_shutdown();
        splhigh();
-       cold = 1;
 
        if ((howto & RB_DUMP))
                dumpsys();

diff --git a/sys/arch/solbourne/solbourne/machdep.c b/sys/arch/solbourne/solbourne/machdep.c
index ac79965..e8be76b 100644 (file)
--- a/sys/arch/solbourne/solbourne/machdep.c
+++ b/sys/arch/solbourne/solbourne/machdep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: machdep.c,v 1.32 2014/05/30 13:46:16 mpi Exp $        */
+/*     $OpenBSD: machdep.c,v 1.33 2014/05/31 15:49:28 mpi Exp $        */
 /*     OpenBSD: machdep.c,v 1.105 2005/04/11 15:13:01 deraadt Exp      */
 
 /*
@@ -554,8 +554,7 @@ boot(howto)
        if_downall();
 
        uvm_shutdown();
-       splhigh();              /* Disable interrupts. */
-       cold = 1;
+       (void) splhigh();               /* ??? */
 
        if (howto & RB_DUMP)
                dumpsys();

diff --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c
index babc719..b6148d6 100644 (file)
--- 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();

diff --git a/sys/arch/sparc64/sparc64/machdep.c b/sys/arch/sparc64/sparc64/machdep.c
index 1ef0bf1..f322309 100644 (file)
--- a/sys/arch/sparc64/sparc64/machdep.c
+++ b/sys/arch/sparc64/sparc64/machdep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: machdep.c,v 1.156 2014/05/30 13:46:17 mpi Exp $       */
+/*     $OpenBSD: machdep.c,v 1.157 2014/05/31 15:49:28 mpi Exp $       */
 /*     $NetBSD: machdep.c,v 1.108 2001/07/24 19:30:14 eeh Exp $ */
 
 /*-
@@ -648,8 +648,7 @@ boot(howto)
        if_downall();
 
        uvm_shutdown();
-       splhigh();              /* Disable interrupts. */
-       cold = 1;
+       (void) splhigh();               /* ??? */
 
        /* If rebooting and a dump is requested, do it. */
        if (howto & RB_DUMP)

diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c
index 98a8e3d..3ec0881 100644 (file)
--- a/sys/arch/vax/vax/machdep.c
+++ b/sys/arch/vax/vax/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.135 2014/05/30 13:46:17 mpi Exp $ */
+/* $OpenBSD: machdep.c,v 1.136 2014/05/31 15:49:28 mpi Exp $ */
 /* $NetBSD: machdep.c,v 1.108 2000/09/13 15:00:23 thorpej Exp $         */
 
 /*
@@ -538,8 +538,7 @@ boot(howto)
        if_downall();
 
        uvm_shutdown();
-       splhigh();              /* Disable interrupts. */
-       cold = 1;
+       splhigh();              /* extreme priority */
 
        /* If rebooting and a dump is requested, do it. */
        if (howto & RB_DUMP)

diff --git a/sys/arch/zaurus/zaurus/zaurus_machdep.c b/sys/arch/zaurus/zaurus/zaurus_machdep.c
index 8f66e15..313080d 100644 (file)
--- a/sys/arch/zaurus/zaurus/zaurus_machdep.c
+++ b/sys/arch/zaurus/zaurus/zaurus_machdep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: zaurus_machdep.c,v 1.43 2014/05/30 13:46:17 mpi Exp $ */
+/*     $OpenBSD: zaurus_machdep.c,v 1.44 2014/05/31 15:49:28 mpi Exp $ */
 /*     $NetBSD: lubbock_machdep.c,v 1.2 2003/07/15 00:25:06 lukem Exp $ */
 
 /*
@@ -315,9 +315,8 @@ boot(int howto)
        if (!(howto & RB_NOSYNC))
                bootsync(howto);
 
-       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)