6559990 user-level read/write locks should be much faster

6550115 Signal delivery causes unbounded priority inversions

1 files changed, 6 insertions, 11 deletions

diff --git a/usr/src/uts/intel/sys/synch32.h b/usr/src/uts/intel/sys/synch32.h
index 3966fac47d..1674444b6d 100644
--- a/usr/src/uts/intel/sys/synch32.h
+++ b/usr/src/uts/intel/sys/synch32.h
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,8 +18,9 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -67,17 +67,12 @@ extern "C" {
 #define	rwlock_readers		readers
 #define	rwlock_type		type
 #define	rwlock_magic		magic
-#define	rwlock_mwaiters		mutex.mutex_waiters
-#define	rwlock_mlockw		mutex.mutex_lockw
-#define	rwlock_mowner		mutex.mutex_owner
-#define	rwlock_mownerpid	mutex.mutex_ownerpid
 #define	rwlock_owner		readercv.data
 #define	rwlock_ownerpid		writercv.data
 
 #define	URW_HAS_WAITERS		0x80000000
-#define	URW_WRITE_WANTED	0x40000000
-#define	URW_WRITE_LOCKED	0x20000000
-#define	URW_READERS_MASK	0x1fffffff
+#define	URW_WRITE_LOCKED	0x40000000
+#define	URW_READERS_MASK	0x3fffffff
 
 #ifdef	__cplusplus
 }