From owner-svn-src-stable-6@FreeBSD.ORG  Tue Dec 30 09:43:02 2008
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 25B4C106564A;
	Tue, 30 Dec 2008 09:43:02 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 14C438FC13;
	Tue, 30 Dec 2008 09:43:02 +0000 (UTC) (envelope-from mav@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 mBU9h1sm086343;
	Tue, 30 Dec 2008 09:43:01 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBU9h1DZ086342;
	Tue, 30 Dec 2008 09:43:01 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <200812300943.mBU9h1DZ086342@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Tue, 30 Dec 2008 09:43:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186599 - stable/6/sys/kern
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
	<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>, 
	<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>, 
	<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Dec 2008 09:43:02 -0000

Author: mav
Date: Tue Dec 30 09:43:01 2008
New Revision: 186599
URL: http://svn.freebsd.org/changeset/base/186599

Log:
  MFC rev. 1.227
  
  ng_node and ng_worklist locks both migrated from being spinning locks to
  adaptive mutexes. Let witness(4) calm down and bring proper types of those
  locks to the lock order database.

Modified:
  stable/6/sys/kern/subr_witness.c

Modified: stable/6/sys/kern/subr_witness.c
==============================================================================
--- stable/6/sys/kern/subr_witness.c	Tue Dec 30 09:40:50 2008	(r186598)
+++ stable/6/sys/kern/subr_witness.c	Tue Dec 30 09:43:01 2008	(r186599)
@@ -349,6 +349,12 @@ static struct witness_order_list_entry o
 	{ "so_snd", &lock_class_mtx_sleep },
 	{ NULL, NULL },
 	/*
+	 * Netgraph
+	 */
+	{ "ng_node", &lock_class_mtx_sleep },
+	{ "ng_worklist", &lock_class_mtx_sleep },
+	{ NULL, NULL },
+	/*
 	 * CDEV
 	 */
 	{ "system map", &lock_class_mtx_sleep },
@@ -370,8 +376,6 @@ static struct witness_order_list_entry o
 	{ "uart_hwmtx", &lock_class_mtx_spin },
 	{ "sabtty", &lock_class_mtx_spin },
 	{ "zstty", &lock_class_mtx_spin },
-	{ "ng_node", &lock_class_mtx_spin },
-	{ "ng_worklist", &lock_class_mtx_spin },
 	{ "fast_taskqueue", &lock_class_mtx_spin },
 	{ "intr table", &lock_class_mtx_spin },
 	{ "sleepq chain", &lock_class_mtx_spin },