From owner-svn-src-all@FreeBSD.ORG  Tue Jun  8 16:17:47 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 5736F10656C1;
	Tue,  8 Jun 2010 16:17:47 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 46F938FC26;
	Tue,  8 Jun 2010 16:17:47 +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 o58GHlWM050134;
	Tue, 8 Jun 2010 16:17:47 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o58GHlKu050132;
	Tue, 8 Jun 2010 16:17:47 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201006081617.o58GHlKu050132@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 8 Jun 2010 16:17:47 +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: r208912 - head/sys/kern
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, 08 Jun 2010 16:17:47 -0000

Author: jhb
Date: Tue Jun  8 16:17:47 2010
New Revision: 208912
URL: http://svn.freebsd.org/changeset/base/208912

Log:
  Fix a sign bug that caused adaptive spinning in sx_xlock() to not work
  properly.  Among other things it did not drop Giant while spinning
  leading to livelocks.
  
  Reviewed by:	rookie, kib, jmallett
  MFC after:	3 days

Modified:
  head/sys/kern/kern_sx.c

Modified: head/sys/kern/kern_sx.c
==============================================================================
--- head/sys/kern/kern_sx.c	Tue Jun  8 16:17:25 2010	(r208911)
+++ head/sys/kern/kern_sx.c	Tue Jun  8 16:17:47 2010	(r208912)
@@ -511,7 +511,7 @@ _sx_xlock_hard(struct sx *sx, uintptr_t 
 		 * running or the state of the lock changes.
 		 */
 		x = sx->sx_lock;
-		if ((sx->lock_object.lo_flags & SX_NOADAPTIVE) != 0) {
+		if ((sx->lock_object.lo_flags & SX_NOADAPTIVE) == 0) {
 			if ((x & SX_LOCK_SHARED) == 0) {
 				x = SX_OWNER(x);
 				owner = (struct thread *)x;