From owner-svn-src-head@FreeBSD.ORG  Wed Jun  8 19:28:59 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B79CA106564A;
	Wed,  8 Jun 2011 19:28:59 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A7AB68FC17;
	Wed,  8 Jun 2011 19:28:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p58JSxcM043928;
	Wed, 8 Jun 2011 19:28:59 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p58JSxuB043926;
	Wed, 8 Jun 2011 19:28:59 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201106081928.p58JSxuB043926@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Wed, 8 Jun 2011 19:28:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222865 - head/sys/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Jun 2011 19:28:59 -0000

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;
 	}