diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-08-16 09:21:20 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-08-16 09:22:04 +0300 |
| commit | c45bd374e560873f2fff392769b9576c4f3bad40 (patch) | |
| tree | bc1e6a1e649cb552bdd23d5ae42444a207cfc579 | |
| parent | a4192d32ae6788dc607e96fa85f9c9c8274e2212 (diff) | |
| download | kernel_samsung_smdk4412-c45bd374e560873f2fff392769b9576c4f3bad40.zip kernel_samsung_smdk4412-c45bd374e560873f2fff392769b9576c4f3bad40.tar.gz kernel_samsung_smdk4412-c45bd374e560873f2fff392769b9576c4f3bad40.tar.bz2 | |
omap: Use CONFIG_SMP for test_for_ipi and test_for_ltirq
Otherwise we get the following error when enabling CONFIG_SMP
for omap3_defconfig:
arch/arm/kernel/entry-armv.S: Assembler messages:
arch/arm/kernel/entry-armv.S:48: Error: bad instruction `test_for_ipi r0,r6,r5,lr'
arch/arm/kernel/entry-armv.S:48: Error: bad instruction `test_for_ltirq r0,r6,r5,lr'
arch/arm/kernel/entry-armv.S:48: Error: bad instruction `test_for_ipi r0,r6,r5,lr'
arch/arm/kernel/entry-armv.S:48: Error: bad instruction `test_for_ltirq r0,r6,r5,lr'
Signed-off-by: Tony Lindgren <tony@atomide.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
| -rw-r--r-- | arch/arm/mach-omap2/include/mach/entry-macro.S | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/include/mach/entry-macro.S b/arch/arm/mach-omap2/include/mach/entry-macro.S index 50fd749..06e64e1 100644 --- a/arch/arm/mach-omap2/include/mach/entry-macro.S +++ b/arch/arm/mach-omap2/include/mach/entry-macro.S @@ -177,7 +177,10 @@ omap_irq_base: .word 0 cmpne \irqnr, \tmp cmpcs \irqnr, \irqnr .endm +#endif +#endif /* MULTI_OMAP2 */ +#ifdef CONFIG_SMP /* We assume that irqstat (the raw value of the IRQ acknowledge * register) is preserved from the macro above. * If there is an IPI, we immediately signal end of interrupt @@ -205,8 +208,7 @@ omap_irq_base: .word 0 streq \irqstat, [\base, #GIC_CPU_EOI] cmp \tmp, #0 .endm -#endif -#endif /* MULTI_OMAP2 */ +#endif /* CONFIG_SMP */ .macro irq_prio_table .endm |