svn commit: r262937 - head/sys/dev/bvm

[Neel Natu]

Author: neel
Date: Sun Mar  9 02:07:15 2014
New Revision: 262937
URL: http://svnweb.freebsd.org/changeset/base/262937

Log:
  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().

Modified:
  head/sys/dev/bvm/bvm_console.c

Modified: head/sys/dev/bvm/bvm_console.c
==============================================================================
--- head/sys/dev/bvm/bvm_console.c	Sun Mar  9 02:00:48 2014	(r262936)
+++ head/sys/dev/bvm/bvm_console.c	Sun Mar  9 02:07:15 2014	(r262937)
@@ -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