PERFORCE change 90882 for review

[John Baldwin]

http://perforce.freebsd.org/chv.cgi?CH=90882

Change 90882 by jhb at jhb_slimer on 2006/02/01 16:01:47

	IFC @90526 to just get the new files before subsequent fixes.

Affected files ...

.. //depot/projects/smpng/sys/conf/files#165 integrate
.. //depot/projects/smpng/sys/conf/options#113 integrate
.. //depot/projects/smpng/sys/kern/kern_ktr.c#33 integrate
.. //depot/projects/smpng/sys/kern/kern_rwlock.c#1 branch
.. //depot/projects/smpng/sys/kern/subr_lock.c#3 integrate
.. //depot/projects/smpng/sys/sys/lock.h#38 integrate
.. //depot/projects/smpng/sys/sys/proc.h#160 integrate
.. //depot/projects/smpng/sys/sys/rwlock.h#1 branch

Differences ...

==== //depot/projects/smpng/sys/conf/files#165 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1086 2006/01/26 01:30:33 cognet Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1087 2006/01/27 23:13:24 jhb Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -1268,6 +1268,7 @@
 kern/kern_proc.c		standard
 kern/kern_prot.c		standard
 kern/kern_resource.c		standard
+kern/kern_rwlock.c		standard
 kern/kern_sema.c		standard
 kern/kern_shutdown.c		standard
 kern/kern_sig.c			standard

==== //depot/projects/smpng/sys/conf/options#113 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.524 2006/01/10 09:19:08 phk Exp $
+# $FreeBSD: src/sys/conf/options,v 1.525 2006/01/27 23:13:25 jhb Exp $
 #
 #        On the handling of kernel options
 #
@@ -513,6 +513,7 @@
 MSIZE			opt_global.h
 REGRESSION		opt_global.h
 RESTARTABLE_PANICS	opt_global.h
+RWLOCK_NOINLINE		opt_global.h
 VFS_BIO_DEBUG		opt_global.h
 
 # These are VM related options

==== //depot/projects/smpng/sys/kern/kern_ktr.c#33 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_ktr.c,v 1.50 2006/01/27 22:17:31 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_ktr.c,v 1.51 2006/01/27 23:06:08 jhb Exp $");
 
 #include "opt_ddb.h"
 #include "opt_ktr.h"
@@ -154,9 +154,9 @@
 
 	enable = ktr_alq_enabled;
 
-        error = sysctl_handle_int(oidp, &enable, 0, req);
-        if (error || !req->newptr)
-                return (error);
+	error = sysctl_handle_int(oidp, &enable, 0, req);
+	if (error || !req->newptr)
+		return (error);
 
 	if (enable) {
 		if (ktr_alq_enabled)

==== //depot/projects/smpng/sys/kern/subr_lock.c#3 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/subr_lock.c,v 1.3 2006/01/18 18:02:50 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/subr_lock.c,v 1.4 2006/01/27 23:13:25 jhb Exp $");
 
 #include "opt_ddb.h"
 
@@ -53,6 +53,7 @@
 	&lock_class_mtx_spin,
 	&lock_class_mtx_sleep,
 	&lock_class_sx,
+	&lock_class_rw,
 };
 
 void

==== //depot/projects/smpng/sys/sys/lock.h#38 (text+ko) ====

@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $
- * $FreeBSD: src/sys/sys/lock.h,v 1.57 2006/01/27 22:20:14 jhb Exp $
+ * $FreeBSD: src/sys/sys/lock.h,v 1.58 2006/01/27 23:13:26 jhb Exp $
  */
 
 #ifndef _SYS_LOCK_H_
@@ -211,6 +211,7 @@
 extern struct lock_class lock_class_mtx_sleep;
 extern struct lock_class lock_class_mtx_spin;
 extern struct lock_class lock_class_sx;
+extern struct lock_class lock_class_rw;
 
 extern struct lock_class *lock_classes[];
 

==== //depot/projects/smpng/sys/sys/proc.h#160 (text+ko) ====

@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)proc.h	8.15 (Berkeley) 5/19/95
- * $FreeBSD: src/sys/sys/proc.h,v 1.447 2006/01/18 20:18:40 julian Exp $
+ * $FreeBSD: src/sys/sys/proc.h,v 1.448 2006/01/27 23:04:43 jhb Exp $
  */
 
 #ifndef _SYS_PROC_H_
@@ -269,6 +269,7 @@
 	u_char		td_oncpu;	/* (j) Which cpu we are on. */
 	volatile u_char td_owepreempt;  /* (k*) Preempt on last critical_exit */
 	short		td_locks;	/* (k) DEBUG: lockmgr count of locks. */
+	u_char		td_tsqueue;	/* (j) Turnstile queue blocked on. */
 	struct turnstile *td_blocked;	/* (j) Lock thread is blocked on. */
 	const char	*td_lockname;	/* (j) Name of lock blocked on. */
 	LIST_HEAD(, turnstile) td_contested;	/* (q) Contested locks. */