From owner-p4-projects@FreeBSD.ORG  Wed Jun 28 01:10:23 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5ED0016A50A; Wed, 28 Jun 2006 01:10:23 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 383A316A4CA
	for <perforce@freebsd.org>; Wed, 28 Jun 2006 01:10:23 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C13FA43DD9
	for <perforce@freebsd.org>; Wed, 28 Jun 2006 01:09:11 +0000 (GMT)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5S19BUA029841
	for <perforce@freebsd.org>; Wed, 28 Jun 2006 01:09:11 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5S19B5Y029838
	for perforce@freebsd.org; Wed, 28 Jun 2006 01:09:11 GMT
	(envelope-from kmacy@freebsd.org)
Date: Wed, 28 Jun 2006 01:09:11 GMT
Message-Id: <200606280109.k5S19B5Y029838@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 100180 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Jun 2006 01:10:23 -0000

http://perforce.freebsd.org/chv.cgi?CH=100180

Change 100180 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/28 01:08:31

	Whoops!

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/kern/kern_lock.c#5 edit

Differences ...

==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_lock.c#5 (text+ko) ====

@@ -160,8 +160,8 @@
 		thr = td;
 
 	lock_profile_waitstart(&waitstart);
-	if ((flags & LK_INTERNAL) == 0)
-		mtx_lock(lkp->lk_interlock);
+	mtx_lock(lkp->lk_interlock);
+
 	CTR6(KTR_LOCK,
 	    "lockmgr(): lkp == %p (lk_wmesg == \"%s\"), owner == %p, exclusivecount == %d, flags == 0x%x, "
 	    "td == %p", lkp, lkp->lk_wmesg, lkp->lk_lockholder,
@@ -174,6 +174,10 @@
 	}
 #endif
 
+	if (flags & LK_INTERLOCK) {
+		mtx_assert(interlkp, MA_OWNED | MA_NOTRECURSED);
+		mtx_unlock(interlkp);
+	}
 	if ((flags & (LK_NOWAIT|LK_RELEASE)) == 0)
 		WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK,
 		    &lkp->lk_interlock->mtx_object,