From owner-svn-src-projects@FreeBSD.ORG  Fri Jan  8 22:52:02 2010
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 CC33C106568B;
	Fri,  8 Jan 2010 22:52:02 +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 BC3358FC0A;
	Fri,  8 Jan 2010 22:52:02 +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 o08Mq2fU016120;
	Fri, 8 Jan 2010 22:52:02 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o08Mq2xH016118;
	Fri, 8 Jan 2010 22:52:02 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201001082252.o08Mq2xH016118@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 8 Jan 2010 22:52:02 +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: r201846 - 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: Fri, 08 Jan 2010 22:52:02 -0000

Author: imp
Date: Fri Jan  8 22:52:02 2010
New Revision: 201846
URL: http://svn.freebsd.org/changeset/base/201846

Log:
  Revert r199758.  It pointed out that we were calling pcpu_init way too
  late...

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

Modified: projects/mips/sys/kern/kern_shutdown.c
==============================================================================
--- projects/mips/sys/kern/kern_shutdown.c	Fri Jan  8 22:48:21 2010	(r201845)
+++ projects/mips/sys/kern/kern_shutdown.c	Fri Jan  8 22:52:02 2010	(r201846)
@@ -516,8 +516,7 @@ panic(const char *fmt, ...)
 	va_list ap;
 	static char buf[256];
 
-	if (td)
-		critical_enter();
+	critical_enter();
 #ifdef SMP
 	/*
 	 * We don't want multiple CPU's to panic at the same time, so we
@@ -576,8 +575,7 @@ panic(const char *fmt, ...)
 	/* thread_unlock(td); */
 	if (!sync_on_panic)
 		bootopt |= RB_NOSYNC;
-	if (td)
-		critical_exit();
+	critical_exit();
 	boot(bootopt);
 }