PERFORCE change 228768 for review

[John Baldwin]

http://p4web.freebsd.org/@@228768?ac=10

Change 228768 by jhb at jhb_fiver on 2013/05/16 17:52:10

	Merge fixes.

Affected files ...

.. //depot/projects/smpng/sys/dev/hptmv/entry.c#25 edit
.. //depot/projects/smpng/sys/kern/kern_timeout.c#61 edit

Differences ...

==== //depot/projects/smpng/sys/dev/hptmv/entry.c#25 (text+ko) ====

@@ -1293,10 +1293,10 @@
 static void hpt_init(void *dummy)
 {
 	override_kernel_driver();	
-	mtx_init(&driver_lock, "hptsleeplock", NULL, MTX_DEF);
 }
 SYSINIT(hptinit, SI_SUB_CONFIGURE, SI_ORDER_FIRST, hpt_init, NULL);
-SYSUNINIT(hptinit, SI_SUB_CONFIGURE, SI_ORDER_FIRST, mtx_destroy, &driver_lock);
+
+MTX_SYSINIT(driver_lock, &driver_lock, "hptsleeplock", MTX_DEF);
 #endif
 
 static int num_adapters = 0;

==== //depot/projects/smpng/sys/kern/kern_timeout.c#61 (text+ko) ====

@@ -1440,7 +1440,7 @@
     0, 0, sysctl_kern_callout_stat, "I",
     "Dump immediate statistic snapshot of the scheduled callouts");
 
-#ifdef DDB
+#ifdef DDB_XXX
 #if 0
 static void
 db_print_ticks(int ticks)
@@ -1487,7 +1487,7 @@
 	/* First, count the number of callouts. */
 	callouts = 0;
 	for (bucket = 0; bucket < callwheelsize; bucket++) {
-		TAILQ_FOREACH(c, &cc->cc_callwheel[bucket], c_links.tqe) {
+		LIST_FOREACH(c, &cc->cc_callwheel[bucket], c_links.le) {
 			callouts++;
 		}
 	}
@@ -1495,7 +1495,7 @@
 	sticks = cc->cc_softticks;
 	do {
 		bucket = sticks & callwheelmask;
-		TAILQ_FOREACH(c, &cc->cc_callwheel[bucket], c_links.tqe) {
+		LIST_FOREACH(c, &cc->cc_callwheel[bucket], c_links.le) {
 			if (c->c_time < sticks)
 				continue;
 			if (c->c_time > sticks)