From owner-p4-projects@FreeBSD.ORG  Mon Jul 28 18:08:42 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 598D31065675; Mon, 28 Jul 2008 18:08:42 +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 1D7481065670
	for <perforce@FreeBSD.org>; Mon, 28 Jul 2008 18:08:42 +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 012278FC12
	for <perforce@FreeBSD.org>; Mon, 28 Jul 2008 18:08:42 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m6SI8fn4056941
	for <perforce@FreeBSD.org>; Mon, 28 Jul 2008 18:08:41 GMT
	(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6SI8fTY056939
	for perforce@freebsd.org; Mon, 28 Jul 2008 18:08:41 GMT
	(envelope-from ed@FreeBSD.org)
Date: Mon, 28 Jul 2008 18:08:41 GMT
Message-Id: <200807281808.m6SI8fTY056939@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 146139 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: Mon, 28 Jul 2008 18:08:42 -0000

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

Change 146139 by ed@ed_dull on 2008/07/28 18:08:12

	I forgot to realize /dev/console also picks up Giant. This means
	we can actually recurse on the TTY lock, if it's Giant.

Affected files ...

.. //depot/projects/mpsafetty/sys/kern/tty.c#8 edit

Differences ...

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

@@ -1168,7 +1168,11 @@
 	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);
 
 	if (tp->t_mtx == &Giant) {
 		/*
@@ -1200,7 +1204,11 @@
 	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);
 
 	if (tp->t_mtx == &Giant) {
 		/*