ARM: 6959/1: SMP build fix for entry-macro-multi.S
authorMagnus Damm <damm@opensource.se>
Mon, 13 Jun 2011 05:46:44 +0000 (06:46 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 17 Jun 2011 10:25:03 +0000 (11:25 +0100)
commit2bc58a6fd76f89052c7f151d78fb2d8b804aacfe
tree4492a9b31ee291c8258bce496e051c096bea066f
parenteb96c925152fc289311e5d7e956b919e9b60ab53
ARM: 6959/1: SMP build fix for entry-macro-multi.S

The assembly code in entry-macro-multi.S does not build without
the include asm/assembler.h in the case of CONFIG_SMP=y.

Fixes the rather theoretical SMP build of mach-shmobile/entry-intc.c:

arch/arm/include/asm/entry-macro-multi.S: Assembler messages:
arch/arm/include/asm/entry-macro-multi.S:20: Error: bad instruction `alt_smp(test_for_ipi r0,r6,r5,lr)'
arch/arm/include/asm/entry-macro-multi.S:20: Error: bad instruction `alt_up_b(9997f)'
make[1]: *** [arch/arm/mach-shmobile/entry-intc.o] Error 1
make: *** [arch/arm/mach-shmobile] Error 2
make: *** Waiting for unfinished jobs....

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/include/asm/assembler.h
arch/arm/include/asm/entry-macro-multi.S