From owner-svn-src-projects@FreeBSD.ORG  Tue Nov 24 17:06:12 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3909F1065694;
	Tue, 24 Nov 2009 17:06:12 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2936F8FC22;
	Tue, 24 Nov 2009 17:06:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAOH6Cg5024564;
	Tue, 24 Nov 2009 17:06:12 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAOH6CRn024562;
	Tue, 24 Nov 2009 17:06:12 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200911241706.nAOH6CRn024562@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 24 Nov 2009 17:06:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r199758 - projects/mips/sys/kern
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Nov 2009 17:06:12 -0000

Author: imp
Date: Tue Nov 24 17:06:11 2009
New Revision: 199758
URL: http://svn.freebsd.org/changeset/base/199758

Log:
  Only all critical_enter()/critical_exit() if curthread has been set.
  Otherwise we dereference a null pointer and can't get useful panic
  info early in boot.

Modified:
  projects/mips/sys/kern/kern_shutdown.c

Modified: projects/mips/sys/kern/kern_shutdown.c
==============================================================================
--- projects/mips/sys/kern/kern_shutdown.c	Tue Nov 24 16:57:35 2009	(r199757)
+++ projects/mips/sys/kern/kern_shutdown.c	Tue Nov 24 17:06:11 2009	(r199758)
@@ -516,7 +516,8 @@ panic(const char *fmt, ...)
 	va_list ap;
 	static char buf[256];
 
-	critical_enter();
+	if (td)
+		critical_enter();
 #ifdef SMP
 	/*
 	 * We don't want multiple CPU's to panic at the same time, so we
@@ -575,7 +576,8 @@ panic(const char *fmt, ...)
 	/* thread_unlock(td); */
 	if (!sync_on_panic)
 		bootopt |= RB_NOSYNC;
-	critical_exit();
+	if (td)
+		critical_exit();
 	boot(bootopt);
 }