From owner-svn-src-head@FreeBSD.ORG  Sat May 16 23:56:45 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E9105106564A;
	Sat, 16 May 2009 23:56:45 +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 A18088FC08;
	Sat, 16 May 2009 23:56:45 +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 n4GNujrT007967;
	Sat, 16 May 2009 23:56:45 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4GNujDB007965;
	Sat, 16 May 2009 23:56:45 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200905162356.n4GNujDB007965@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 16 May 2009 23:56:45 +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: r192234 - head/sys/cddl/compat/opensolaris/sys
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 16 May 2009 23:56:46 -0000

Author: kmacy
Date: Sat May 16 23:56:45 2009
New Revision: 192234
URL: http://svn.freebsd.org/changeset/base/192234

Log:
  enable adaptive spinning on zfs locks

Modified:
  head/sys/cddl/compat/opensolaris/sys/mutex.h
  head/sys/cddl/compat/opensolaris/sys/rwlock.h

Modified: head/sys/cddl/compat/opensolaris/sys/mutex.h
==============================================================================
--- head/sys/cddl/compat/opensolaris/sys/mutex.h	Sat May 16 23:33:07 2009	(r192233)
+++ head/sys/cddl/compat/opensolaris/sys/mutex.h	Sat May 16 23:56:45 2009	(r192234)
@@ -47,9 +47,9 @@ typedef enum {
 typedef struct sx	kmutex_t;
 
 #ifndef DEBUG
-#define	MUTEX_FLAGS	(SX_DUPOK | SX_NOWITNESS)
+#define	MUTEX_FLAGS	(SX_DUPOK | SX_NOWITNESS | SX_ADAPTIVESPIN)
 #else
-#define	MUTEX_FLAGS	(SX_DUPOK)
+#define	MUTEX_FLAGS	(SX_DUPOK | SX_ADAPTIVESPIN)
 #endif
 
 #define	mutex_init(lock, desc, type, arg)	do {			\

Modified: head/sys/cddl/compat/opensolaris/sys/rwlock.h
==============================================================================
--- head/sys/cddl/compat/opensolaris/sys/rwlock.h	Sat May 16 23:33:07 2009	(r192233)
+++ head/sys/cddl/compat/opensolaris/sys/rwlock.h	Sat May 16 23:56:45 2009	(r192234)
@@ -49,9 +49,9 @@ typedef enum {
 typedef	struct sx	krwlock_t;
 
 #ifndef DEBUG
-#define	RW_FLAGS	(SX_DUPOK | SX_NOWITNESS)
+#define	RW_FLAGS	(SX_DUPOK | SX_NOWITNESS | SX_ADAPTIVESPIN)
 #else
-#define	RW_FLAGS	(SX_DUPOK)
+#define	RW_FLAGS	(SX_DUPOK | SX_ADAPTIVESPIN)
 #endif
 
 #define	RW_READ_HELD(x)		(rw_read_held((x)))