PERFORCE change 165015 for review

[Prashant Vaibhav]

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

Change 165015 by pvaibhav at 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 *