Skip to contentSkip to conversation

ARM: Do not call test_for_ipi or test_for_ltrirq on UP systems

PATCH New Tony Lindgren 1 participant 1 message Sep 2, 2010 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 4/6 ARM: Do not call test_for_ipi or test_for_ltrirq on UP systems

Do not call test_for_ipi or test_for_ltrirq on UP systems.

Note that we can't put test_for_ltriq into SMP statement as it's inlined into the code and the remaining lines of the macro would still run before UP macro line.

---
 arch/arm/kernel/entry-armv.S |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
arch/arm/kernel/entry-armv.S +6 -0
index bb2ef60..b8c1ec7 100644
@@ -40,6 +40,11 @@
 	bne	asm_do_IRQ
 
 #ifdef CONFIG_SMP
+#ifdef CONFIG_SMP_ON_UP
+	adr	lr, BSYM(2f)	@ set lr to end of macro for early return
+	SMP(nop)		@ continue on SMP hardware
+	UP(mov	pc, lr)		@ return early on UP
+#endif
 	/*
 	 * XXX
 	 *
@@ -57,6 +62,7 @@
 	adrne	lr, BSYM(1b)
 	bne	do_local_timer
 #endif
+2:
 #endif
 
 	.endm
Signature · 1 line
1.7.1