From owner-svn-src-all@FreeBSD.ORG Sun Sep 19 14:30:51 2010 Return-Path: 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 D28F21065670; Sun, 19 Sep 2010 14:30:51 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from mail.zoral.com.ua (mx0.zoral.com.ua [91.193.166.200]) by mx1.freebsd.org (Postfix) with ESMTP id 448288FC1A; Sun, 19 Sep 2010 14:30:50 +0000 (UTC) Received: from deviant.kiev.zoral.com.ua (root@deviant.kiev.zoral.com.ua [10.1.1.148]) by mail.zoral.com.ua (8.14.2/8.14.2) with ESMTP id o8JEUl9g068047 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 19 Sep 2010 17:30:47 +0300 (EEST) (envelope-from kostikbel@gmail.com) Received: from deviant.kiev.zoral.com.ua (kostik@localhost [127.0.0.1]) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4) with ESMTP id o8JEUl6I043750; Sun, 19 Sep 2010 17:30:47 +0300 (EEST) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4/Submit) id o8JEUlAr043749; Sun, 19 Sep 2010 17:30:47 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: deviant.kiev.zoral.com.ua: kostik set sender to kostikbel@gmail.com using -f Date: Sun, 19 Sep 2010 17:30:47 +0300 From: Kostik Belousov To: Ed Schouten Message-ID: <20100919143047.GB2389@deviant.kiev.zoral.com.ua> References: <201009191421.o8JELdNY004586@svn.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="BKMA2OjimIttCqMD" Content-Disposition: inline In-Reply-To: <201009191421.o8JELdNY004586@svn.freebsd.org> User-Agent: Mutt/1.4.2.3i X-Virus-Scanned: clamav-milter 0.95.2 at skuns.kiev.zoral.com.ua X-Virus-Status: Clean X-Spam-Status: No, score=-2.5 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_20, DNS_FROM_OPENWHOIS autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on skuns.kiev.zoral.com.ua Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r212860 - 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Sep 2010 14:30:51 -0000 --BKMA2OjimIttCqMD Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 >=20 > Log: > Ignore DCD handling on /dev/console entirely. > =20 > This makes /dev/console more fail-safe and prevents a potential console > lock-up during boot. > =20 > Discussed on: stable@ > Tested by: koitsu@ > MFC after: 1 week >=20 > Modified: > head/sys/kern/tty.c >=20 > Modified: head/sys/kern/tty.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 > =20 > /* Wait for Carrier Detect. */ > if (!TTY_CALLOUT(tp, dev) && (oflags & O_NONBLOCK) =3D=3D 0 && > - (tp->t_termios.c_cflag & CLOCAL) =3D=3D 0) { > + (tp->t_termios.c_cflag & CLOCAL) =3D=3D 0 && > + dev !=3D dev_console) { > while ((ttydevsw_modem(tp, 0, 0) & SER_DCD) =3D=3D 0) { > error =3D tty_wait(tp, &tp->t_dcdwait); > if (error !=3D 0) Shouldn't you always report CLOCAL for console then ? --BKMA2OjimIttCqMD Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (FreeBSD) iEYEARECAAYFAkyWHpYACgkQC3+MBN1Mb4gzhQCg7k1qEYnTi0AHaBEysuKkvBzo xgEAnj21FwfS0AVskjI0/DY/5HntZmTu =zoAg -----END PGP SIGNATURE----- --BKMA2OjimIttCqMD--