From owner-p4-projects@FreeBSD.ORG  Fri Jan 18 21:10:02 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D294916A421; Fri, 18 Jan 2008 21:10:01 +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 97B4116A41B
	for <perforce@freebsd.org>; Fri, 18 Jan 2008 21:10:01 +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 7CC9413C4F3
	for <perforce@freebsd.org>; Fri, 18 Jan 2008 21:10:01 +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 m0ILA1Z3078461
	for <perforce@freebsd.org>; Fri, 18 Jan 2008 21:10:01 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0ILA13X078457
	for perforce@freebsd.org; Fri, 18 Jan 2008 21:10:01 GMT
	(envelope-from kmacy@freebsd.org)
Date: Fri, 18 Jan 2008 21:10:01 GMT
Message-Id: <200801182110.m0ILA13X078457@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 133594 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:10:02 -0000

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

Change 133594 by kmacy@pandemonium:kmacy:xen31 on 2008/01/18 21:09:58

	don't call ttwakeup from a critical section

Affected files ...

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

Differences ...

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

@@ -19,6 +19,7 @@
 #include <machine/xen/xen_intr.h>
 #include <sys/cons.h>
 #include <sys/priv.h>
+#include <sys/proc.h>
 
 #include <dev/xen/console/xencons_ring.h>
 #include <xen/interface/io/console.h>
@@ -318,8 +319,12 @@
 		work_done = 1;
 	}
 	CN_UNLOCK(cn_mtx);
-	
-	if (work_done && xen_console_up)
+
+	/*
+	 * ttwakeup calls routines using blocking locks
+	 *
+	 */
+	if (work_done && xen_console_up && curthread->td_critnest == 0)
 		ttwakeup(xccons);
 }