From owner-p4-projects@FreeBSD.ORG  Tue Jun 23 23:20:40 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6A35910656BE; Tue, 23 Jun 2009 23:20:40 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2214010656BA
	for <perforce@FreeBSD.org>; Tue, 23 Jun 2009 23:20:40 +0000 (UTC)
	(envelope-from pvaibhav@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0FE318FC0A
	for <perforce@FreeBSD.org>; Tue, 23 Jun 2009 23:20:40 +0000 (UTC)
	(envelope-from pvaibhav@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n5NNKd6F083905
	for <perforce@FreeBSD.org>; Tue, 23 Jun 2009 23:20:39 GMT
	(envelope-from pvaibhav@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5NNKdDU083903
	for perforce@freebsd.org; Tue, 23 Jun 2009 23:20:39 GMT
	(envelope-from pvaibhav@FreeBSD.org)
Date: Tue, 23 Jun 2009 23:20:39 GMT
Message-Id: <200906232320.n5NNKdDU083903@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pvaibhav@FreeBSD.org using -f
From: Prashant Vaibhav <pvaibhav@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 165015 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: Tue, 23 Jun 2009 23:20:41 -0000

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

Change 165015 by pvaibhav@pvaibhav_matrix on 2009/06/23 23:19:56

	Forgot to include panic fix (mutex must be unlocked in callout_tick()
	regardless of whether softclock() is to be scheduled or not). 

Affected files ...

.. //depot/projects/soc2009/calloutapi/src/sys/kern/kern_timeout.c#3 edit

Differences ...

==== //depot/projects/soc2009/calloutapi/src/sys/kern/kern_timeout.c#3 (text+ko) ====

@@ -259,10 +259,9 @@
 	 * swi_sched acquires the thread lock, so we don't want to call
 	 * it with cc_lock held; incorrect locking order.
 	 */
-	if (need_softclock == 1) {
-		mtx_unlock_spin_flags(&cc->cc_lock, MTX_QUIET);
+	mtx_unlock_spin_flags(&cc->cc_lock, MTX_QUIET);
+	if (need_softclock)
 		swi_sched(cc->cc_cookie, 0);
-	}
 }
 
 static struct callout_cpu *