From owner-svn-src-user@FreeBSD.ORG  Mon May 25 02:09:10 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3CE48106566B;
	Mon, 25 May 2009 02:09:10 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2B2C88FC13;
	Mon, 25 May 2009 02:09:10 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4P29AF9007469;
	Mon, 25 May 2009 02:09:10 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4P29AN9007468;
	Mon, 25 May 2009 02:09:10 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200905250209.n4P29AN9007468@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Mon, 25 May 2009 02:09:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r192712 - user/kmacy/releng_7_2_fcs/sys/kern
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 May 2009 02:09:10 -0000

Author: kmacy
Date: Mon May 25 02:09:09 2009
New Revision: 192712
URL: http://svn.freebsd.org/changeset/base/192712

Log:
  remove SX_SPINS limit

Modified:
  user/kmacy/releng_7_2_fcs/sys/kern/kern_sx.c

Modified: user/kmacy/releng_7_2_fcs/sys/kern/kern_sx.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/kern/kern_sx.c	Mon May 25 02:05:00 2009	(r192711)
+++ user/kmacy/releng_7_2_fcs/sys/kern/kern_sx.c	Mon May 25 02:09:09 2009	(r192712)
@@ -57,10 +57,6 @@ __FBSDID("$FreeBSD$");
 
 #ifdef ADAPTIVE_SX
 #include <machine/cpu.h>
-
-#ifndef SX_SPINS
-#define	SX_SPINS 1000
-#endif
 #endif
 
 #ifdef DDB
@@ -481,12 +477,8 @@ _sx_xlock_hard(struct sx *sx, uintptr_t 
 				GIANT_SAVE();
 				spin_count = 0;
 				while (SX_OWNER(sx->sx_lock) == x &&
-				    TD_IS_RUNNING(owner) &&
-				    (spin_count++ < SX_SPINS))
+				    TD_IS_RUNNING(owner))
 					cpu_spinwait();
-
-				if (spin_count < SX_SPINS)
-					continue;
 			}
 		}
 #endif
@@ -718,11 +710,8 @@ _sx_slock_hard(struct sx *sx, int opts, 
 				GIANT_SAVE();
 				spin_count = 0;
 				while (SX_OWNER(sx->sx_lock) == x &&
-				    TD_IS_RUNNING(owner) &&
-				    (spin_count++ < SX_SPINS))
+				    TD_IS_RUNNING(owner))
 					cpu_spinwait();
-				if (spin_count < SX_SPINS)
-					continue;
 			}
 		}
 #endif