From owner-p4-projects@FreeBSD.ORG  Fri Jan 18 21:30:22 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D022516A468; Fri, 18 Jan 2008 21:30:22 +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 960F516A419
	for <perforce@freebsd.org>; Fri, 18 Jan 2008 21:30:22 +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 7C4F113C45D
	for <perforce@freebsd.org>; Fri, 18 Jan 2008 21:30:22 +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 m0ILUMQ6081968
	for <perforce@freebsd.org>; Fri, 18 Jan 2008 21:30:22 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0ILUMDb081965
	for perforce@freebsd.org; Fri, 18 Jan 2008 21:30:22 GMT
	(envelope-from kmacy@freebsd.org)
Date: Fri, 18 Jan 2008 21:30:22 GMT
Message-Id: <200801182130.m0ILUMDb081965@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 133596 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: Fri, 18 Jan 2008 21:30:23 -0000

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

Change 133596 by kmacy@pandemonium:kmacy:xen31 on 2008/01/18 21:30:00

	don't acquire the console lock if we're in the middle of a panic

Affected files ...

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

Differences ...

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

@@ -79,8 +79,16 @@
 #define CN_LOCK_INIT(x, _name) \
         mtx_init(&x, _name, NULL, MTX_SPIN|MTX_RECURSE)
 
-#define CN_LOCK(l)        mtx_lock_spin(&(l))
-#define CN_UNLOCK(l)      mtx_unlock_spin(&(l))
+#define CN_LOCK(l)        								\
+		do {											\
+				if (panicstr == NULL)					\
+                        mtx_lock_spin(&(l));			\
+		} while (0)
+#define CN_UNLOCK(l)        							\
+		do {											\
+				if (panicstr == NULL)					\
+                        mtx_unlock_spin(&(l));			\
+		} while (0)
 #define CN_LOCK_ASSERT(x)    mtx_assert(&x, MA_OWNED)
 #define CN_LOCK_DESTROY(x)   mtx_destroy(&x)