From owner-svn-src-all@FreeBSD.ORG  Tue Sep 14 01:48:01 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8B8D5106566C;
	Tue, 14 Sep 2010 01:48:01 +0000 (UTC)
	(envelope-from neel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7ADA58FC17;
	Tue, 14 Sep 2010 01:48:01 +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 o8E1m1mQ053744;
	Tue, 14 Sep 2010 01:48:01 GMT (envelope-from neel@svn.freebsd.org)
Received: (from neel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8E1m1tn053742;
	Tue, 14 Sep 2010 01:48:01 GMT (envelope-from neel@svn.freebsd.org)
Message-Id: <201009140148.o8E1m1tn053742@svn.freebsd.org>
From: Neel Natu <neel@FreeBSD.org>
Date: Tue, 14 Sep 2010 01:48:01 +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: r212593 - head/sys/mips/mips
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Sep 2010 01:48:01 -0000

Author: neel
Date: Tue Sep 14 01:48:01 2010
New Revision: 212593
URL: http://svn.freebsd.org/changeset/base/212593

Log:
  Port r212559 to mips.
  
  Do not explicitly enable interrupts in smp_init_secondary() because it
  renders any spinlock protected code after that point to run with
  interrupts enabled. This is because the processor is executing in the
  context of idlethread whose 'md_spinlock_count' is already set to 1.
  
  Instead just let sched_throw() re-enable interrupts when it releases
  the spinlock.
  
  The original powerpc commit log for r212559 is available here:
  http://svn.freebsd.org/viewvc/base?view=revision&revision=212559

Modified:
  head/sys/mips/mips/mp_machdep.c

Modified: head/sys/mips/mips/mp_machdep.c
==============================================================================
--- head/sys/mips/mips/mp_machdep.c	Tue Sep 14 01:40:59 2010	(r212592)
+++ head/sys/mips/mips/mp_machdep.c	Tue Sep 14 01:48:01 2010	(r212593)
@@ -310,8 +310,6 @@ smp_init_secondary(u_int32_t cpuid)
 	while (smp_started == 0)
 		; /* nothing */
 
-	intr_enable();
-
 	/* Start per-CPU event timers. */
 	cpu_initclocks_ap();