From owner-p4-projects@FreeBSD.ORG  Sun Oct 26 14:14:31 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 604831065672; Sun, 26 Oct 2008 14:14:31 +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 24A4A106566B
	for <perforce@FreeBSD.org>; Sun, 26 Oct 2008 14:14:31 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 148178FC08
	for <perforce@FreeBSD.org>; Sun, 26 Oct 2008 14:14:31 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9QEEUnk068489
	for <perforce@FreeBSD.org>; Sun, 26 Oct 2008 14:14:30 GMT
	(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9QEEUUb068487
	for perforce@freebsd.org; Sun, 26 Oct 2008 14:14:30 GMT
	(envelope-from ed@FreeBSD.org)
Date: Sun, 26 Oct 2008 14:14:30 GMT
Message-Id: <200810261414.m9QEEUUb068487@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ed@FreeBSD.org using -f
From: Ed Schouten <ed@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 151955 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: Sun, 26 Oct 2008 14:14:31 -0000

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

Change 151955 by ed@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;
 }