From owner-svn-src-user@FreeBSD.ORG  Sat Sep  5 23:23:49 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 9572D106566B;
	Sat,  5 Sep 2009 23:23:49 +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 842948FC12;
	Sat,  5 Sep 2009 23:23:49 +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 n85NNnTm066743;
	Sat, 5 Sep 2009 23:23:49 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n85NNnX9066740;
	Sat, 5 Sep 2009 23:23:49 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200909052323.n85NNnX9066740@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 5 Sep 2009 23:23:49 +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: r196874 -
	user/kmacy/releng_7_2_fcs_1/sys/cddl/compat/opensolaris/sys
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: Sat, 05 Sep 2009 23:23:49 -0000

Author: kmacy
Date: Sat Sep  5 23:23:49 2009
New Revision: 196874
URL: http://svn.freebsd.org/changeset/base/196874

Log:
  don't disable WITNESS

Modified:
  user/kmacy/releng_7_2_fcs_1/sys/cddl/compat/opensolaris/sys/mutex.h
  user/kmacy/releng_7_2_fcs_1/sys/cddl/compat/opensolaris/sys/rwlock.h

Modified: user/kmacy/releng_7_2_fcs_1/sys/cddl/compat/opensolaris/sys/mutex.h
==============================================================================
--- user/kmacy/releng_7_2_fcs_1/sys/cddl/compat/opensolaris/sys/mutex.h	Sat Sep  5 22:27:44 2009	(r196873)
+++ user/kmacy/releng_7_2_fcs_1/sys/cddl/compat/opensolaris/sys/mutex.h	Sat Sep  5 23:23:49 2009	(r196874)
@@ -46,11 +46,8 @@ typedef enum {
 
 typedef struct sx	kmutex_t;
 
-#ifndef DEBUG
-#define	MUTEX_FLAGS	(SX_DUPOK | SX_NOWITNESS | SX_ADAPTIVESPIN)
-#else
+
 #define	MUTEX_FLAGS	(SX_DUPOK | SX_ADAPTIVESPIN)
-#endif
 
 #define	mutex_init(lock, desc, type, arg)	do {			\
 	const char *_name;						\

Modified: user/kmacy/releng_7_2_fcs_1/sys/cddl/compat/opensolaris/sys/rwlock.h
==============================================================================
--- user/kmacy/releng_7_2_fcs_1/sys/cddl/compat/opensolaris/sys/rwlock.h	Sat Sep  5 22:27:44 2009	(r196873)
+++ user/kmacy/releng_7_2_fcs_1/sys/cddl/compat/opensolaris/sys/rwlock.h	Sat Sep  5 23:23:49 2009	(r196874)
@@ -48,11 +48,7 @@ typedef enum {
 
 typedef	struct sx	krwlock_t;
 
-#ifndef DEBUG
-#define	RW_FLAGS	(SX_DUPOK | SX_NOWITNESS | SX_ADAPTIVESPIN)
-#else
 #define	RW_FLAGS	(SX_DUPOK | SX_ADAPTIVESPIN)
-#endif
 
 #define	RW_READ_HELD(x)		(rw_read_held((x)))
 #define	RW_WRITE_HELD(x)	(rw_write_held((x)))