svn commit: r222865 - head/sys/kern

[Attilio Rao]

Author: attilio
Date: Wed Jun  8 19:28:59 2011
New Revision: 222865
URL: http://svn.freebsd.org/changeset/base/222865

Log:
  In the current code, a double panic condition may lead to dumps
  interleaving.
  Signal dumping to happen only for the first panic which should be the
  most important.
  
  Sponsored by:	Sandvine Incorporated
  Submitted by:	Nima Misaghian (nmisaghian AT sandvine DOT com)
  MFC after:	2 weeks

Modified:
  head/sys/kern/kern_shutdown.c

Modified: head/sys/kern/kern_shutdown.c
==============================================================================
--- head/sys/kern/kern_shutdown.c	Wed Jun  8 18:52:42 2011	(r222864)
+++ head/sys/kern/kern_shutdown.c	Wed Jun  8 19:28:59 2011	(r222865)
@@ -555,11 +555,12 @@ panic(const char *fmt, ...)
 				; /* nothing */
 #endif
 
-	bootopt = RB_AUTOBOOT | RB_DUMP;
+	bootopt = RB_AUTOBOOT;
 	newpanic = 0;
 	if (panicstr)
 		bootopt |= RB_NOSYNC;
 	else {
+		bootopt |= RB_DUMP;
 		panicstr = fmt;
 		newpanic = 1;
 	}