svn commit: r212860 - head/sys/kern

[Ed Schouten]

Author: ed
Date: Sun Sep 19 14:21:39 2010
New Revision: 212860
URL: http://svn.freebsd.org/changeset/base/212860

Log:
  Ignore DCD handling on /dev/console entirely.
  
  This makes /dev/console more fail-safe and prevents a potential console
  lock-up during boot.
  
  Discussed on:	stable@
  Tested by:	koitsu@
  MFC after:	1 week

Modified:
  head/sys/kern/tty.c

Modified: head/sys/kern/tty.c
==============================================================================
--- head/sys/kern/tty.c	Sun Sep 19 13:49:02 2010	(r212859)
+++ head/sys/kern/tty.c	Sun Sep 19 14:21:39 2010	(r212860)
@@ -282,7 +282,8 @@ ttydev_open(struct cdev *dev, int oflags
 
 	/* Wait for Carrier Detect. */
 	if (!TTY_CALLOUT(tp, dev) && (oflags & O_NONBLOCK) == 0 &&
-	    (tp->t_termios.c_cflag & CLOCAL) == 0) {
+	    (tp->t_termios.c_cflag & CLOCAL) == 0 &&
+	    dev != dev_console) {
 		while ((ttydevsw_modem(tp, 0, 0) & SER_DCD) == 0) {
 			error = tty_wait(tp, &tp->t_dcdwait);
 			if (error != 0)