svn commit: r245477 - head/sys/arm/arm

[Olivier Houchard]

Author: cognet
Date: Tue Jan 15 22:09:11 2013
New Revision: 245477
URL: http://svnweb.freebsd.org/changeset/base/245477

Log:
  Only spin on the blocked_lock for SCHED_ULE+SMP, as it's done on the other
  arches.

Modified:
  head/sys/arm/arm/swtch.S

Modified: head/sys/arm/arm/swtch.S
==============================================================================
--- head/sys/arm/arm/swtch.S	Tue Jan 15 22:08:17 2013	(r245476)
+++ head/sys/arm/arm/swtch.S	Tue Jan 15 22:09:11 2013	(r245477)
@@ -79,6 +79,7 @@
  */
 
 #include "assym.s"
+#include "opt_sched.h"
 
 #include <machine/asm.h>
 #include <machine/asmacros.h>
@@ -428,6 +429,7 @@ ENTRY(cpu_switch)
 
 	/* Release the old thread */
 	str	r6, [r4, #TD_LOCK]
+#if defined(SCHED_ULE) && defined(SMP)
 	ldr	r6, .Lblocked_lock
 	GET_CURTHREAD_PTR(r3)
 
@@ -435,6 +437,7 @@ ENTRY(cpu_switch)
 	ldr	r4, [r3, #TD_LOCK]
 	cmp	r4, r6
 	beq	1b
+#endif
 	
 	/* XXXSCW: Safe to re-enable FIQs here */