From: Arnd Bergmann Date: Thu, 21 May 2015 08:36:42 +0000 (+0200) Subject: ARM: zx: fix building with CONFIG_THUMB2_KERNEL X-Git-Tag: firefly_0821_release~176^2~1557^2~14 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=993198a641a8feedcb2186f201dac0717d299152;p=firefly-linux-kernel-4.4.55.git ARM: zx: fix building with CONFIG_THUMB2_KERNEL The newly added zx platform causes a build error when CONFIG_THUMB2_KERNEL is enabled: arch/arm/mach-zx/headsmp.S:16: Error: invalid immediate for address calculation (value = 0x00000004) I'm assuming that the ROM code that is calling these entry points runs in ARM mode, so there would be another problem in the same file, and we can solve both problems at once by adding a '.arm' statement that will make zx_resume_jump and zx_secondary_startup both be built as ARM code. Signed-off-by: Arnd Bergmann Acked-by: Jun Nie Tested-by: Jun Nie --- diff --git a/arch/arm/mach-zx/headsmp.S b/arch/arm/mach-zx/headsmp.S index c0fece0c3955..a1aa4028389f 100644 --- a/arch/arm/mach-zx/headsmp.S +++ b/arch/arm/mach-zx/headsmp.S @@ -10,6 +10,7 @@ #include .align 3 + .arm /* It runs from physical address */ ENTRY(zx_resume_jump)