Commit 2bc58a6f authored Jun 13, 2011 by Magnus Damm Committed by Russell King Jun 17, 2011

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>

parent eb96c925

arch/arm/include/asm/assembler.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,9 @@
		* Do not include any C declarations in this file - it is included by
		* assembler source.
		*/
		#ifndef __ASM_ASSEMBLER_H__
		#define __ASM_ASSEMBLER_H__

		#ifndef __ASSEMBLY__
		#error "Only include this from assembly code"
		#endif
		@@ -290,3 +293,4 @@
		.macro ldrusr, reg, ptr, inc, cond=al, rept=1, abort=9001f
		usracc ldr, \reg, \ptr, \inc, \cond, \rept, \abort
		.endm
		#endif /* __ASM_ASSEMBLER_H__ */

arch/arm/include/asm/entry-macro-multi.S

+2 −0

Original line number	Diff line number	Diff line
		#include <asm/assembler.h>

		/*
		* Interrupt handling. Preserves r7, r8, r9
		*/