diff options
| author | emax <emax@FreeBSD.org> | 2008-11-17 20:33:13 +0000 |
|---|---|---|
| committer | emax <emax@FreeBSD.org> | 2008-11-17 20:33:13 +0000 |
| commit | d2f579595c362ce27b4d87e2c40e1c4e09b929e3 (patch) | |
| tree | 75f7329870344a3fe36e3da6dbd9b7ab7e2be33c /sys/dev/syscons | |
| parent | f3d74d62d37e8bf8ef5dd002e75273cfa6951166 (diff) | |
| download | FreeBSD-src-d2f579595c362ce27b4d87e2c40e1c4e09b929e3.zip FreeBSD-src-d2f579595c362ce27b4d87e2c40e1c4e09b929e3.tar.gz | |
Undo revision 185013 until better solution is found.
Pointed out by: bde
Diffstat (limited to 'sys/dev/syscons')
| -rw-r--r-- | sys/dev/syscons/syscons.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 90b5afa..37b08b6 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -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)) { |
