Cosmetic changes to reduce diffs.

diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c
index f4db528..5b11412 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.160 2014/07/10 21:46:02 mpi Exp $ */
+/* $OpenBSD: machdep.c,v 1.161 2014/07/13 22:13:06 uebayasi Exp $ */
 /* $NetBSD: machdep.c,v 1.210 2000/06/01 17:12:38 thorpej Exp $ */
 
 /*-
@@ -1006,7 +1006,7 @@ boot(int howto)
        if_downall();
 
        uvm_shutdown();
-       splhigh();              /* Disable interrupts. */
+       splhigh();
        cold = 1;
 
 #if defined(MULTIPROCESSOR)
@@ -1031,7 +1031,6 @@ boot(int howto)
                    cpus_running);
 #endif
 
-       /* If rebooting and a dump is requested do it. */
        if (howto & RB_DUMP)
                dumpsys();
 

diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c
index af75418..0c767c7 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.186 2014/07/13 12:11:01 jasper Exp $    */
+/*     $OpenBSD: machdep.c,v 1.187 2014/07/13 22:13:06 uebayasi Exp $  */
 /*     $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */
 
 /*-
@@ -773,10 +773,9 @@ boot(int howto)
        delay(4*1000000);       /* XXX */
 
        uvm_shutdown();
-       splhigh();              /* Disable interrupts. */
+       splhigh();
        cold = 1;
 
-       /* Do a dump if requested. */
        if (howto & RB_DUMP)
                dumpsys();
 

diff --git a/sys/arch/armish/armish/armish_machdep.c b/sys/arch/armish/armish/armish_machdep.c
index fc80ce4..339d071 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.28 2014/07/10 21:46:02 mpi Exp $ */
+/*     $OpenBSD: armish_machdep.c,v 1.29 2014/07/13 22:13:06 uebayasi Exp $ */
 /*     $NetBSD: lubbock_machdep.c,v 1.2 2003/07/15 00:25:06 lukem Exp $ */
 
 /*
@@ -270,10 +270,9 @@ boot(int howto)
        if_downall();
 
        uvm_shutdown();
-       splhigh();              /* Disable interrupts. */
+       splhigh();
        cold = 1;
 
-       /* Do a dump if requested. */
        if ((howto & (RB_DUMP | RB_HALT)) == RB_DUMP)
                dumpsys();
        

diff --git a/sys/arch/armv7/armv7/armv7_machdep.c b/sys/arch/armv7/armv7/armv7_machdep.c
index 67cade6..1cd368b 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.11 2014/07/10 21:46:02 mpi Exp $ */
+/*     $OpenBSD: armv7_machdep.c,v 1.12 2014/07/13 22:13:06 uebayasi Exp $ */
 /*     $NetBSD: lubbock_machdep.c,v 1.2 2003/07/15 00:25:06 lukem Exp $ */
 
 /*
@@ -286,14 +286,12 @@ boot(int howto)
        if_downall();
 
        uvm_shutdown();
-       splhigh();              /* Disable interrupts. */
+       splhigh();
        cold = 1;
 
-       /* Do a dump if requested. */
        if ((howto & (RB_DUMP | RB_HALT)) == RB_DUMP)
                dumpsys();
 
-       /* Run any shutdown hooks */
        doshutdownhooks();
        if (mainbus != NULL)
                config_suspend(mainbus, DVACT_POWERDOWN);

diff --git a/sys/arch/aviion/aviion/machdep.c b/sys/arch/aviion/aviion/machdep.c
index 7e4a829..e8e3683 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.68 2014/07/10 21:46:02 mpi Exp $        */
+/*     $OpenBSD: machdep.c,v 1.69 2014/07/13 22:13:06 uebayasi Exp $   */
 /*
  * Copyright (c) 2007 Miodrag Vallat.
  *
@@ -309,18 +309,18 @@ boot(int howto)
        if ((howto & RB_NOSYNC) == 0) {
                vfs_shutdown();
 
-               if ((howto & RB_TIMEBAD) == 0)
+               if ((howto & RB_TIMEBAD) == 0) {
                        resettodr();
-               else
+               } else {
                        printf("WARNING: not updating battery clock\n");
+               }
        }
        if_downall();
 
        uvm_shutdown();
-       splhigh();              /* Disable interrupts. */
+       splhigh();
        cold = 1;
 
-       /* If rebooting and a dump is requested, do it. */
        if (howto & RB_DUMP)
                dumpsys();
 

diff --git a/sys/arch/hppa/hppa/machdep.c b/sys/arch/hppa/hppa/machdep.c
index 3bac6ec..4db910e 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.229 2014/07/13 09:08:20 miod Exp $      */
+/*     $OpenBSD: machdep.c,v 1.230 2014/07/13 22:13:06 uebayasi Exp $  */
 
 /*
  * Copyright (c) 1999-2003 Michael Shalayeff
@@ -912,10 +912,11 @@ boot(int howto)
                waittime = 0;
                vfs_shutdown();
 
-               if ((howto & RB_TIMEBAD) == 0)
+               if ((howto & RB_TIMEBAD) == 0) {
                        resettodr();
-               else
+               } else {
                        printf("WARNING: not updating battery clock\n");
+               }
        }
        if_downall();
 

diff --git a/sys/arch/hppa64/hppa64/machdep.c b/sys/arch/hppa64/hppa64/machdep.c
index 3b1a7ae..adec950 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.67 2014/07/13 09:08:20 miod Exp $       */
+/*     $OpenBSD: machdep.c,v 1.68 2014/07/13 22:13:06 uebayasi Exp $   */
 
 /*
  * Copyright (c) 2005 Michael Shalayeff
@@ -549,10 +549,11 @@ boot(int howto)
                waittime = 0;
                vfs_shutdown();
 
-               if ((howto & RB_TIMEBAD) == 0)
+               if ((howto & RB_TIMEBAD) == 0) {
                        resettodr();
-               else
+               } else {
                        printf("WARNING: not updating battery clock\n");
+               }
        }
        if_downall();
 

diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 06b6e58..685e65b 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.546 2014/07/11 22:28:05 uebayasi Exp $  */
+/*     $OpenBSD: machdep.c,v 1.547 2014/07/13 22:13:06 uebayasi Exp $  */
 /*     $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $    */
 
 /*-
@@ -2584,7 +2584,7 @@ boot(int howto)
        delay(4*1000000);       /* XXX */
 
        uvm_shutdown();
-       splhigh();              /* Disable interrupts. */
+       splhigh();
        cold = 1;
 
        /* Do a dump if requested. */

diff --git a/sys/arch/landisk/landisk/machdep.c b/sys/arch/landisk/landisk/machdep.c
index 7bf1ace..5d800bc 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.36 2014/07/10 21:46:03 mpi Exp $        */
+/*     $OpenBSD: machdep.c,v 1.37 2014/07/13 22:13:06 uebayasi Exp $   */
 /*     $NetBSD: machdep.c,v 1.1 2006/09/01 21:26:18 uwe Exp $  */
 
 /*-
@@ -205,15 +205,16 @@ boot(int howto)
        if ((howto & RB_NOSYNC) == 0) {
                vfs_shutdown();
 
-               if ((howto & RB_TIMEBAD) == 0)
+               if ((howto & RB_TIMEBAD) == 0) {
                        resettodr();
-               else
+               } else {
                        printf("WARNING: not updating battery clock\n");
+               }
        }
        if_downall();
 
        uvm_shutdown();
-       splhigh();              /* Disable interrupts. */
+       splhigh();
        cold = 1;
 
        /* Do a dump if requested. */

diff --git a/sys/arch/loongson/loongson/machdep.c b/sys/arch/loongson/loongson/machdep.c
index da43949..3513bc7 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.54 2014/07/11 22:28:05 uebayasi Exp $ */
+/*     $OpenBSD: machdep.c,v 1.55 2014/07/13 22:13:06 uebayasi Exp $ */
 
 /*
  * Copyright (c) 2009, 2010, 2014 Miodrag Vallat.
@@ -927,7 +927,7 @@ boot(int howto)
        if_downall();
 
        uvm_shutdown();
-       splhigh();              /* Disable interrupts. */
+       splhigh();
        cold = 1;
 
        if (howto & RB_DUMP)

diff --git a/sys/arch/luna88k/luna88k/machdep.c b/sys/arch/luna88k/luna88k/machdep.c
index 1b0b68e..67058a0 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.105 2014/07/10 21:46:03 mpi Exp $       */
+/*     $OpenBSD: machdep.c,v 1.106 2014/07/13 22:13:07 uebayasi Exp $  */
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -483,18 +483,18 @@ boot(int howto)
        if ((howto & RB_NOSYNC) == 0) {
                vfs_shutdown();
 
-               if ((howto & RB_TIMEBAD) == 0)
+               if ((howto & RB_TIMEBAD) == 0) {
                        resettodr();
-               else
+               } else {
                        printf("WARNING: not updating battery clock\n");
+               }
        }
        if_downall();
 
        uvm_shutdown();
-       splhigh();                      /* Disable interrupts. */
+       splhigh();
        cold = 1;
 
-       /* If rebooting and a dump is requested, do it. */
        if (howto & RB_DUMP)
                dumpsys();
 

diff --git a/sys/arch/macppc/macppc/machdep.c b/sys/arch/macppc/macppc/machdep.c
index 2aa1f42..0a83f03 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.157 2014/07/10 21:46:03 mpi Exp $       */
+/*     $OpenBSD: machdep.c,v 1.158 2014/07/13 22:13:07 uebayasi Exp $  */
 /*     $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $   */
 
 /*
@@ -815,7 +815,7 @@ boot(int howto)
        boothowto = howto;
        if (!(howto & RB_NOSYNC) && !syncing) {
                syncing = 1;
-               vfs_shutdown();         /* sync */
+               vfs_shutdown();
 
                if ((howto & RB_TIMEBAD) == 0) {
                        resettodr();

diff --git a/sys/arch/octeon/octeon/machdep.c b/sys/arch/octeon/octeon/machdep.c
index 37ae6c0..fb6c6ab 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.57 2014/07/13 18:07:38 jasper Exp $ */
+/*     $OpenBSD: machdep.c,v 1.58 2014/07/13 22:13:07 uebayasi Exp $ */
 
 /*
  * Copyright (c) 2009, 2010 Miodrag Vallat.
@@ -691,7 +691,7 @@ boot(int howto)
        if_downall();
 
        uvm_shutdown();
-       splhigh();              /* Disable interrupts. */
+       splhigh();
        cold = 1;
 
        if (howto & RB_DUMP)

diff --git a/sys/arch/sgi/sgi/machdep.c b/sys/arch/sgi/sgi/machdep.c
index 574ce8a..f6f6851 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.145 2014/07/11 22:28:05 uebayasi Exp $ */
+/*     $OpenBSD: machdep.c,v 1.146 2014/07/13 22:13:07 uebayasi Exp $ */
 
 /*
  * Copyright (c) 2003-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -854,7 +854,7 @@ boot(int howto)
        if_downall();
 
        uvm_shutdown();
-       splhigh();              /* Disable interrupts. */
+       splhigh();
        cold = 1;
 
        if (howto & RB_DUMP)

diff --git a/sys/arch/socppc/socppc/machdep.c b/sys/arch/socppc/socppc/machdep.c
index 68adb42..c5e8339 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.52 2014/07/10 21:46:03 mpi Exp $        */
+/*     $OpenBSD: machdep.c,v 1.53 2014/07/13 22:13:07 uebayasi Exp $   */
 /*     $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $   */
 
 /*
@@ -1043,7 +1043,7 @@ boot(int howto)
        boothowto = howto;
        if (!(howto & RB_NOSYNC) && !syncing) {
                syncing = 1;
-               vfs_shutdown();         /* sync */
+               vfs_shutdown();
 
                if ((howto & RB_TIMEBAD) == 0) {
                        resettodr();

diff --git a/sys/arch/solbourne/solbourne/machdep.c b/sys/arch/solbourne/solbourne/machdep.c
index 893768e..a8c5aab 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.39 2014/07/12 18:44:42 tedu Exp $       */
+/*     $OpenBSD: machdep.c,v 1.40 2014/07/13 22:13:07 uebayasi Exp $   */
 /*     OpenBSD: machdep.c,v 1.105 2005/04/11 15:13:01 deraadt Exp      */
 
 /*
@@ -541,7 +541,7 @@ boot(int howto)
        if_downall();
 
        uvm_shutdown();
-       splhigh();              /* Disable interrupts. */
+       splhigh();
        cold = 1;
 
        if (howto & RB_DUMP)

diff --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c
index 75103fc..ef44477 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.161 2014/07/12 18:44:43 tedu Exp $      */
+/*     $OpenBSD: machdep.c,v 1.162 2014/07/13 22:13:07 uebayasi Exp $  */
 /*     $NetBSD: machdep.c,v 1.85 1997/09/12 08:55:02 pk Exp $ */
 
 /*
@@ -550,7 +550,7 @@ boot(int howto)
        if_downall();
 
        uvm_shutdown();
-       splhigh();              /* Disable interrupts. */
+       splhigh();
        cold = 1;
 
        if (howto & RB_DUMP)

diff --git a/sys/arch/sparc64/sparc64/machdep.c b/sys/arch/sparc64/sparc64/machdep.c
index b3f721a..4d28099 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.164 2014/07/12 18:44:43 tedu Exp $      */
+/*     $OpenBSD: machdep.c,v 1.165 2014/07/13 22:13:07 uebayasi Exp $  */
 /*     $NetBSD: machdep.c,v 1.108 2001/07/24 19:30:14 eeh Exp $ */
 
 /*-
@@ -640,10 +640,9 @@ boot(int howto)
        if_downall();
 
        uvm_shutdown();
-       splhigh();              /* Disable interrupts. */
+       splhigh();
        cold = 1;
 
-       /* If rebooting and a dump is requested, do it. */
        if (howto & RB_DUMP)
                dumpsys();
 

diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c
index bcff777..7380542 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.140 2014/07/10 21:46:03 mpi Exp $ */
+/* $OpenBSD: machdep.c,v 1.141 2014/07/13 22:13:07 uebayasi Exp $ */
 /* $NetBSD: machdep.c,v 1.108 2000/09/13 15:00:23 thorpej Exp $         */
 
 /*
@@ -532,10 +532,9 @@ boot(int howto)
        if_downall();
 
        uvm_shutdown();
-       splhigh();              /* Disable interrupts. */
+       splhigh();
        cold = 1;
 
-       /* If rebooting and a dump is requested, do it. */
        if (howto & RB_DUMP)
                dumpsys();
 

diff --git a/sys/arch/zaurus/zaurus/zaurus_machdep.c b/sys/arch/zaurus/zaurus/zaurus_machdep.c
index bb394b8..e163328 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.48 2014/07/11 10:10:44 uebayasi Exp $    */
+/*     $OpenBSD: zaurus_machdep.c,v 1.49 2014/07/13 22:13:07 uebayasi Exp $    */
 /*     $NetBSD: lubbock_machdep.c,v 1.2 2003/07/15 00:25:06 lukem Exp $ */
 
 /*
@@ -317,10 +317,9 @@ boot(int howto)
        if_downall();
 
        uvm_shutdown();
-       splhigh();              /* Disable interrupts. */
+       splhigh();
        cold = 1;
 
-       /* Do a dump if requested. */
        if ((howto & (RB_DUMP | RB_HALT)) == RB_DUMP)
                dumpsys();