diff options
| author | Maksim Yevmenkin <emax@FreeBSD.org> | 2008-11-17 20:33:13 +0000 |
|---|---|---|
| committer | Maksim Yevmenkin <emax@FreeBSD.org> | 2008-11-17 20:33:13 +0000 |
| commit | 8fc061164d74a4c9775f39da3c0b5d02112866c8 (patch) | |
| tree | 75f7329870344a3fe36e3da6dbd9b7ab7e2be33c | |
| parent | 2bc989be4f32c5799252e7451a92da2f7eaa3673 (diff) | |
Undo revision 185013 until better solution is found.
Pointed out by: bde
Notes
Notes:
svn path=/head/; revision=185028
| -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 90b5afaa2dc9..37b08b6b24ee 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)) { |