diff options
| author | neel <neel@FreeBSD.org> | 2014-03-09 02:07:15 +0000 |
|---|---|---|
| committer | neel <neel@FreeBSD.org> | 2014-03-09 02:07:15 +0000 |
| commit | 13e66617c72e16e7b53192ac5f7f8c8397c046a8 (patch) | |
| tree | 839aa4c07c9bcdace695c1235c6a7b49575fe888 /sys/dev/bvm | |
| parent | 586576adbcd6c7ba1f607789a4b812d99207ccaf (diff) | |
| download | FreeBSD-src-13e66617c72e16e7b53192ac5f7f8c8397c046a8.zip FreeBSD-src-13e66617c72e16e7b53192ac5f7f8c8397c046a8.tar.gz | |
Fix panic "_mtx_lock_sleep: recursed on non-recursive mutex ttymtx" caused when
acquiring the tty lock in bvm_tty_close(). Instead just assert that the tty
lock is held before calling callout_reset().
Diffstat (limited to 'sys/dev/bvm')
| -rw-r--r-- | sys/dev/bvm/bvm_console.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/dev/bvm/bvm_console.c b/sys/dev/bvm/bvm_console.c index 73cdc2a..a7b1bc5 100644 --- a/sys/dev/bvm/bvm_console.c +++ b/sys/dev/bvm/bvm_console.c @@ -128,9 +128,8 @@ static void bvm_tty_close(struct tty *tp) { - tty_lock(tp); + tty_lock_assert(tp, MA_OWNED); callout_stop(&bvm_timer); - tty_unlock(tp); } static void |
