From owner-p4-projects@FreeBSD.ORG  Sun Feb 25 01:36:37 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 75CAE16A409; Sun, 25 Feb 2007 01:36:37 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2F82616A407
	for <perforce@freebsd.org>; Sun, 25 Feb 2007 01:36:37 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 2135513C478
	for <perforce@freebsd.org>; Sun, 25 Feb 2007 01:36:37 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1P1ab78095591
	for <perforce@freebsd.org>; Sun, 25 Feb 2007 01:36:37 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1P1aatW095588
	for perforce@freebsd.org; Sun, 25 Feb 2007 01:36:36 GMT
	(envelope-from jhb@freebsd.org)
Date: Sun, 25 Feb 2007 01:36:36 GMT
Message-Id: <200702250136.l1P1aatW095588@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 115004 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Feb 2007 01:36:37 -0000

http://perforce.freebsd.org/chv.cgi?CH=115004

Change 115004 by jhb@jhb_zion on 2007/02/25 01:36:24

	Drop the idlespin hack for now.

Affected files ...

.. //depot/projects/smpng/sys/kern/kern_mutex.c#139 edit

Differences ...

==== //depot/projects/smpng/sys/kern/kern_mutex.c#139 (text+ko) ====

@@ -410,14 +410,11 @@
     int line)
 {
 	struct thread *td;
-	int contested = 0, i = 0, idlespin = 0;
+	int contested = 0, i = 0;
 
 	if (LOCK_LOG_TEST(&m->mtx_object, opts))
 		CTR1(KTR_LOCK, "_mtx_lock_spin: %p spinning", m);
 
-	/* It's ok for the idle loop to spin forever on sched_lock. */
-	if (m == &sched_lock && curthread == PCPU_GET(idlethread))
-		idlespin = 1;
 	while (!_obtain_lock(m, tid)) {
 		lock_profile_obtain_lock_failed(&m->mtx_object, &contested);
 
@@ -428,8 +425,7 @@
 				cpu_spinwait();
 				continue;
 			}
-			if (i < 60000000 || kdb_active || panicstr != NULL ||
-			    idlespin)
+			if (i < 60000000 || kdb_active || panicstr != NULL)
 				DELAY(1);
 			else {
 				td = mtx_owner(m);