From owner-svn-src-all@FreeBSD.ORG  Sat Dec 20 09:36:41 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7F6681065670;
	Sat, 20 Dec 2008 09:36:41 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6E20D8FC13;
	Sat, 20 Dec 2008 09:36:41 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBK9afRM097346;
	Sat, 20 Dec 2008 09:36:41 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBK9afrK097345;
	Sat, 20 Dec 2008 09:36:41 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200812200936.mBK9afrK097345@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Sat, 20 Dec 2008 09:36:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186354 - head/sys/kern
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 20 Dec 2008 09:36:41 -0000

Author: ed
Date: Sat Dec 20 09:36:40 2008
New Revision: 186354
URL: http://svn.freebsd.org/changeset/base/186354

Log:
  Let wchan names more closely match pre-MPSAFE TTY behaviour.
  
  Right now the wchan strings "ttyinp" and "ttybgw" only differ one
  character from the strings we used prior to MPSAFE TTY. Just rename them
  back to their pre-MPSAFE TTY counterparts.
  
  Also rename "ttylck" to "ttymtx", which should make it more clear that a
  process is blocked on the TTY mutex, not some other form of locking.

Modified:
  head/sys/kern/tty.c

Modified: head/sys/kern/tty.c
==============================================================================
--- head/sys/kern/tty.c	Sat Dec 20 05:56:08 2008	(r186353)
+++ head/sys/kern/tty.c	Sat Dec 20 09:36:40 2008	(r186354)
@@ -871,9 +871,9 @@ tty_alloc(struct ttydevsw *tsw, void *sc
 
 	tty_init_termios(tp);
 
-	cv_init(&tp->t_inwait, "ttyinp");
+	cv_init(&tp->t_inwait, "ttyin");
 	cv_init(&tp->t_outwait, "ttyout");
-	cv_init(&tp->t_bgwait, "ttybgw");
+	cv_init(&tp->t_bgwait, "ttybg");
 	cv_init(&tp->t_dcdwait, "ttydcd");
 
 	ttyinq_init(&tp->t_inq);
@@ -884,7 +884,7 @@ tty_alloc(struct ttydevsw *tsw, void *sc
 		tp->t_mtx = mutex;
 	} else {
 		tp->t_mtx = &tp->t_mtxobj;
-		mtx_init(&tp->t_mtxobj, "ttylck", NULL, MTX_DEF);
+		mtx_init(&tp->t_mtxobj, "ttymtx", NULL, MTX_DEF);
 	}
 
 	knlist_init(&tp->t_inpoll.si_note, tp->t_mtx, NULL, NULL, NULL);