svn commit: r186354 - head/sys/kern

[Ed Schouten]

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);