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

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

details:   https://anonhg.NetBSD.org/src/rev/467d0cccf811
branches:  netbsd-6-0
changeset: 775011:467d0cccf811
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Sun Nov 09 06:55:34 2014 +0000

description:
Pull up following revision(s) (requested by nakayama in ticket #1176):
        sys/arch/sparc64/sparc64/machdep.c: revision 1.280
        sys/arch/sparc64/sparc64/machdep.c: revision 1.274
Remove duplicate/unused declarations.
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 |  19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diffs (59 lines):

diff -r 619d1499b5a8 -r 467d0cccf811 sys/arch/sparc64/sparc64/machdep.c
--- a/sys/arch/sparc64/sparc64/machdep.c        Sun Nov 09 06:39:12 2014 +0000
+++ b/sys/arch/sparc64/sparc64/machdep.c        Sun Nov 09 06:55:34 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.265.2.1 2012/05/21 15:25:56 riz Exp $ */
+/*     $NetBSD: machdep.c,v 1.265.2.1.4.1 2014/11/09 06:55:34 msaitoh 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.265.2.1 2012/05/21 15:25:56 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.265.2.1.4.1 2014/11/09 06:55:34 msaitoh Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -156,13 +156,10 @@
 #ifdef MODULAR
 vaddr_t module_start, module_end;
 static struct vm_map module_map_store;
-extern struct vm_map *module_map;
 #endif
 
 int    physmem;
 
-extern void *msgbufaddr;
-
 /*
  * Maximum number of DMA segments we'll allow in dmamem_load()
  * routines.  Can be overridden in config files, etc.
@@ -609,12 +606,13 @@
         */
        maybe_dump(howto);
 
-       if ((howto & RB_NOSYNC) == 0 && !syncdone) {
-               extern struct lwp lwp0;
-
+       /*
+        * 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);
                        /*
@@ -642,6 +640,7 @@
        splhigh();
 
 haltsys:
+       doshutdownhooks();
 
 #ifdef MULTIPROCESSOR
        /* Stop all secondary cpus */