From owner-p4-projects@FreeBSD.ORG  Thu May 16 17:52:14 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 48A448C3; Thu, 16 May 2013 17:52:14 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 09FBC8C1
 for <perforce@freebsd.org>; Thu, 16 May 2013 17:52:14 +0000 (UTC)
 (envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id EDF3183C
 for <perforce@freebsd.org>; Thu, 16 May 2013 17:52:13 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r4GHqDEc090099
 for <perforce@freebsd.org>; Thu, 16 May 2013 17:52:13 GMT
 (envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r4GHqD66090096
 for perforce@freebsd.org; Thu, 16 May 2013 17:52:13 GMT
 (envelope-from jhb@freebsd.org)
Date: Thu, 16 May 2013 17:52:13 GMT
Message-Id: <201305161752.r4GHqD66090096@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 228768 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 May 2013 17:52:14 -0000

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

Change 228768 by jhb@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)