svn commit: r185028 - head/sys/dev/syscons
Maksim Yevmenkin
emax at FreeBSD.org
Mon Nov 17 12:33:14 PST 2008
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)) {
More information about the svn-src-all
mailing list