[src/netbsd-7]: src/sys/arch/sparc64/sparc64 Pull up following revision(s) (r...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d9dba9cf1dd8
branches:  netbsd-7
changeset: 798478:d9dba9cf1dd8
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Oct 30 12:33:17 2014 +0000

description:
Pull up following revision(s) (requested by nakayama in ticket #168):
        sys/arch/sparc64/sparc64/machdep.c: revision 1.280
Sync cpu_reboot with i386:
- avoid sync and unmount after panic.
- remove vfs_shutdown, we call vfs_sync_all and vfs_unmount* instead.
- resurrect doshutdownhooks since some drivers still use it (eg. sab(4)).

diffstat:

 sys/arch/sparc64/sparc64/machdep.c |  14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diffs (43 lines):

diff -r 149070ffad0c -r d9dba9cf1dd8 sys/arch/sparc64/sparc64/machdep.c
--- a/sys/arch/sparc64/sparc64/machdep.c        Thu Oct 30 12:30:24 2014 +0000
+++ b/sys/arch/sparc64/sparc64/machdep.c        Thu Oct 30 12:33:17 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.278 2014/07/14 12:40:38 nakayama Exp $ */
+/*     $NetBSD: machdep.c,v 1.278.2.1 2014/10/30 12:33:17 martin Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.278 2014/07/14 12:40:38 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.278.2.1 2014/10/30 12:33:17 martin Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -599,10 +599,13 @@
         */
        maybe_dump(howto);
 
-       if ((howto & RB_NOSYNC) == 0 && !syncdone) {
+       /*
+        * If we've panic'd, don't make the situation potentially
+        * worse by syncing or unmounting the file systems.
+        */
+       if ((howto & RB_NOSYNC) == 0 && panicstr == NULL) {
                if (!syncdone) {
-               syncdone = true;
-               vfs_shutdown();
+                       syncdone = true;
                        /* XXX used to force unmount as well, here */
                        vfs_sync_all(l);
                        /*
@@ -630,6 +633,7 @@
        splhigh();
 
 haltsys:
+       doshutdownhooks();
 
 #ifdef MULTIPROCESSOR
        /* Stop all secondary cpus */