Date: Mon, 17 Nov 2008 20:33:13 +0000 (UTC) From: Maksim Yevmenkin <emax@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r185028 - head/sys/dev/syscons Message-ID: <200811172033.mAHKXD5i092181@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emax Date: Mon Nov 17 20:33:13 2008 New Revision: 185028 URL: http://svn.freebsd.org/changeset/base/185028 Log: Undo revision 185013 until better solution is found. Pointed out by: bde Modified: head/sys/dev/syscons/syscons.c Modified: head/sys/dev/syscons/syscons.c ============================================================================== --- head/sys/dev/syscons/syscons.c Mon Nov 17 20:11:53 2008 (r185027) +++ head/sys/dev/syscons/syscons.c Mon Nov 17 20:33:13 2008 (r185028) @@ -1572,7 +1572,6 @@ sccngetch(int flags) int s = spltty(); /* block sckbdevent and scrn_timer while we poll */ int c; - mtx_lock(&Giant); /* assert(sc_console != NULL) */ /* @@ -1584,13 +1583,11 @@ sccngetch(int flags) sccnupdate(scp); if (fkeycp < fkey.len) { - mtx_unlock(&Giant); splx(s); return fkey.str[fkeycp++]; } if (scp->sc->kbd == NULL) { - mtx_unlock(&Giant); splx(s); return -1; } @@ -1613,7 +1610,6 @@ sccngetch(int flags) scp->kbd_mode = cur_mode; kbdd_ioctl(scp->sc->kbd, KDSKBMODE, (caddr_t)&scp->kbd_mode); kbdd_disable(scp->sc->kbd); - mtx_unlock(&Giant); splx(s); switch (KEYFLAGS(c)) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811172033.mAHKXD5i092181>