svn commit: r186599 - stable/6/sys/kern

[Alexander Motin]

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 },