From owner-p4-projects@FreeBSD.ORG  Thu Feb 14 21:23:31 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 124F916A41A; Thu, 14 Feb 2008 21:23:31 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CB3F016A419
	for <perforce@freebsd.org>; Thu, 14 Feb 2008 21:23:30 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D063413C4CE
	for <perforce@freebsd.org>; Thu, 14 Feb 2008 21:23:30 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1ELNU1D036450
	for <perforce@freebsd.org>; Thu, 14 Feb 2008 21:23:30 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1ELNUgc036447
	for perforce@freebsd.org; Thu, 14 Feb 2008 21:23:30 GMT
	(envelope-from jhb@freebsd.org)
Date: Thu, 14 Feb 2008 21:23:30 GMT
Message-Id: <200802142123.m1ELNUgc036447@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 135416 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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, 14 Feb 2008 21:23:31 -0000

http://perforce.freebsd.org/chv.cgi?CH=135416

Change 135416 by jhb@jhb_mutex on 2008/02/14 21:23:12

	Bah, merge fixes so this branch boots.

Affected files ...

.. //depot/projects/smpng/sys/dev/syscons/syscons.h#19 integrate
.. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#35 edit

Differences ...

==== //depot/projects/smpng/sys/dev/syscons/syscons.h#19 (text+ko) ====

@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/syscons/syscons.h,v 1.89 2007/12/29 21:55:24 wkoszek Exp $
+ * $FreeBSD: src/sys/dev/syscons/syscons.h,v 1.90 2008/02/13 23:38:08 jhb Exp $
  */
 
 #ifndef _DEV_SYSCONS_SYSCONS_H_
@@ -517,7 +517,8 @@
 #define ISSIGVALID(sig)	((sig) > 0 && (sig) < NSIG)
 
 #define SC_VIDEO_LOCKINIT(sc)						\
-		mtx_init(&(sc)->video_mtx, "syscons video lock", NULL,MTX_SPIN);
+		mtx_init(&(sc)->video_mtx, "syscons video lock", NULL,	\
+		    MTX_SPIN | MTX_RECURSE);
 #define SC_VIDEO_LOCK(sc)						\
 		do {							\
 			if (!cold)					\

==== //depot/projects/smpng/sys/kern/subr_sleepqueue.c#35 (text+ko) ====

@@ -177,7 +177,7 @@
 	for (i = 0; i < SC_TABLESIZE; i++) {
 		LIST_INIT(&sleepq_chains[i].sc_queues);
 		mtx_init(&sleepq_chains[i].sc_lock, "sleepq chain", NULL,
-		    MTX_SPIN);
+		    MTX_SPIN | MTX_RECURSE);
 #ifdef SLEEPQUEUE_PROFILING
 		snprintf(chain_name, sizeof(chain_name), "%d", i);
 		chain_oid = SYSCTL_ADD_NODE(NULL,