From owner-svn-src-user@FreeBSD.ORG  Sat Mar 14 23:59:54 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 495C3106566C;
	Sat, 14 Mar 2009 23:59:54 +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 393298FC17;
	Sat, 14 Mar 2009 23:59:54 +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 n2ENxs6R011707;
	Sat, 14 Mar 2009 23:59:54 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2ENxs2S011706;
	Sat, 14 Mar 2009 23:59:54 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200903142359.n2ENxs2S011706@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 14 Mar 2009 23:59:54 +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: r189840 - user/kmacy/releng_7_net_backport/sys/kern
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, 14 Mar 2009 23:59:54 -0000

Author: kmacy
Date: Sat Mar 14 23:59:53 2009
New Revision: 189840
URL: http://svn.freebsd.org/changeset/base/189840

Log:
  update lock types

Modified:
  user/kmacy/releng_7_net_backport/sys/kern/subr_witness.c

Modified: user/kmacy/releng_7_net_backport/sys/kern/subr_witness.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/kern/subr_witness.c	Sat Mar 14 23:48:03 2009	(r189839)
+++ user/kmacy/releng_7_net_backport/sys/kern/subr_witness.c	Sat Mar 14 23:59:53 2009	(r189840)
@@ -306,7 +306,7 @@ static struct witness_order_list_entry o
 	 * Routing
 	 */
 	{ "so_rcv", &lock_class_mtx_sleep },
-	{ "radix node head", &lock_class_mtx_sleep },
+	{ "radix node head", &lock_class_rw },
 	{ "rtentry", &lock_class_mtx_sleep },
 	{ "ifaddr", &lock_class_mtx_sleep },
 	{ NULL, NULL },
@@ -321,6 +321,8 @@ static struct witness_order_list_entry o
 	/*
 	 * UNIX Domain Sockets
 	 */
+	{ "unp_global_rwlock", &lock_class_rw },
+	{ "unp_list_lock", &lock_class_mtx_sleep },
 	{ "unp", &lock_class_mtx_sleep },
 	{ "so_snd", &lock_class_mtx_sleep },
 	{ NULL, NULL },
@@ -422,6 +424,7 @@ static struct witness_order_list_entry o
 	{ "process slock", &lock_class_mtx_spin },
 	{ "sleepq chain", &lock_class_mtx_spin },
 	{ "umtx lock", &lock_class_mtx_spin },
+	{ "rm_spinlock", &lock_class_mtx_spin },
 	{ "turnstile chain", &lock_class_mtx_spin },
 	{ "turnstile lock", &lock_class_mtx_spin },
 	{ "sched lock", &lock_class_mtx_spin },
@@ -436,6 +439,7 @@ static struct witness_order_list_entry o
 	/*
 	 * leaf locks
 	 */
+	{ "intrcnt", &lock_class_mtx_spin },
 	{ "icu", &lock_class_mtx_spin },
 #if defined(SMP) && defined(__sparc64__)
 	{ "ipi", &lock_class_mtx_spin },