From owner-svn-src-head@FreeBSD.ORG  Sun Mar  9 02:07:16 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 87D80FC9;
 Sun,  9 Mar 2014 02:07:16 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7501A2B5;
 Sun,  9 Mar 2014 02:07:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2927Gw2085628;
 Sun, 9 Mar 2014 02:07:16 GMT (envelope-from neel@svn.freebsd.org)
Received: (from neel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2927GF3085625;
 Sun, 9 Mar 2014 02:07:16 GMT (envelope-from neel@svn.freebsd.org)
Message-Id: <201403090207.s2927GF3085625@svn.freebsd.org>
From: Neel Natu <neel@FreeBSD.org>
Date: Sun, 9 Mar 2014 02:07:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r262937 - head/sys/dev/bvm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Mar 2014 02:07:16 -0000

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