PERFORCE change 133594 for review

[Kip Macy]

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

Change 133594 by kmacy at 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);
 }