Date: Sun, 19 Sep 2010 17:30:47 +0300 From: Kostik Belousov <kostikbel@gmail.com> To: Ed Schouten <ed@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r212860 - head/sys/kern Message-ID: <20100919143047.GB2389@deviant.kiev.zoral.com.ua> In-Reply-To: <201009191421.o8JELdNY004586@svn.freebsd.org> References: <201009191421.o8JELdNY004586@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Sun, Sep 19, 2010 at 02:21:39PM +0000, Ed Schouten wrote: > 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) Shouldn't you always report CLOCAL for console then ? [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (FreeBSD) iEYEARECAAYFAkyWHpYACgkQC3+MBN1Mb4gzhQCg7k1qEYnTi0AHaBEysuKkvBzo xgEAnj21FwfS0AVskjI0/DY/5HntZmTu =zoAg -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100919143047.GB2389>