PERFORCE change 151955 for review

[Ed Schouten]

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

Change 151955 by ed at ed_mekker on 2008/10/26 14:14:18

	Recursive locking inside the TTY layer is now gone.

Affected files ...

.. //depot/projects/mpsafetty/sys/kern/tty.c#59 edit
.. //depot/projects/mpsafetty/sys/kern/tty_cons.c#4 edit

Differences ...

==== //depot/projects/mpsafetty/sys/kern/tty.c#59 (text+ko) ====

@@ -1197,11 +1197,7 @@
 	int error;
 	int revokecnt = tp->t_revokecnt;
 
-#if 0
-	/* XXX: /dev/console also picks up Giant. */
 	tty_lock_assert(tp, MA_OWNED|MA_NOTRECURSED);
-#endif
-	tty_lock_assert(tp, MA_OWNED);
 	MPASS(!tty_gone(tp));
 
 	error = cv_wait_sig(cv, tp->t_mtx);
@@ -1223,11 +1219,7 @@
 	int error;
 	int revokecnt = tp->t_revokecnt;
 
-#if 0
-	/* XXX: /dev/console also picks up Giant. */
 	tty_lock_assert(tp, MA_OWNED|MA_NOTRECURSED);
-#endif
-	tty_lock_assert(tp, MA_OWNED);
 	MPASS(!tty_gone(tp));
 
 	error = cv_timedwait_sig(cv, tp->t_mtx, hz);

==== //depot/projects/mpsafetty/sys/kern/tty_cons.c#4 (text+ko) ====

@@ -594,8 +594,6 @@
 cn_drvinit(void *unused)
 {
 
-	/*make_dev(&cn_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "console");*/
-
 	mtx_init(&cnputs_mtx, "cnputs_mtx", NULL, MTX_SPIN | MTX_NOWITNESS);
 	use_cnputs_mtx = 1;
 }