svn commit: r196874 - user/kmacy/releng_7_2_fcs_1/sys/cddl/compat/opensolaris/sys

[Kip Macy]

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)))