From owner-p4-projects@FreeBSD.ORG  Wed Jan  2 04:11:34 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8B6AD16A420; Wed,  2 Jan 2008 04:11:34 +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 5124A16A41A
	for <perforce@freebsd.org>; Wed,  2 Jan 2008 04:11:34 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4271313C447
	for <perforce@freebsd.org>; Wed,  2 Jan 2008 04:11:34 +0000 (UTC)
	(envelope-from kmacy@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 m024BYV3002672
	for <perforce@freebsd.org>; Wed, 2 Jan 2008 04:11:34 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m024BYDP002669
	for perforce@freebsd.org; Wed, 2 Jan 2008 04:11:34 GMT
	(envelope-from kmacy@freebsd.org)
Date: Wed, 2 Jan 2008 04:11:34 GMT
Message-Id: <200801020411.m024BYDP002669@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 132283 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: Wed, 02 Jan 2008 04:11:34 -0000

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

Change 132283 by kmacy@pandemonium:kmacy:xen31 on 2008/01/02 04:11:14

	allow console lock to be acquired recursively, locking is already such
	a mess here that this is ok for now

Affected files ...

.. //depot/projects/xen31/sys/dev/xen/console/console.c#5 edit

Differences ...

==== //depot/projects/xen31/sys/dev/xen/console/console.c#5 (text+ko) ====

@@ -76,7 +76,7 @@
 #define	XCUNIT(x)	(minor(x))
 #define ISTTYOPEN(tp)	((tp) && ((tp)->t_state & TS_ISOPEN))
 #define CN_LOCK_INIT(x, _name) \
-        mtx_init(&x, _name, NULL, MTX_DEF)
+        mtx_init(&x, _name, NULL, MTX_DEF|MTX_RECURSE)
 #define CN_LOCK(l)        mtx_lock(&(l))
 #define CN_UNLOCK(l)      mtx_unlock(&(l))
 #define CN_LOCK_ASSERT(x)    mtx_assert(&x, MA_OWNED)