diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-21 10:36:42 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-22 16:45:54 +0200 |
| commit | 993198a641a8feedcb2186f201dac0717d299152 (patch) | |
| tree | 3aab386bb4c2f75974b274a52b4cb982d05c7e96 /arch/arm/mach-zx | |
| parent | Merge tag 'omap-for-v4.2/omap1-v2' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| download | linux-993198a641a8feedcb2186f201dac0717d299152.tar.xz linux-993198a641a8feedcb2186f201dac0717d299152.zip | |
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 <arnd@arndb.de>
Acked-by: Jun Nie <jun.nie@linaro.org>
Tested-by: Jun Nie <jun.nie@linaro.org>
Diffstat (limited to 'arch/arm/mach-zx')
| -rw-r--r-- | arch/arm/mach-zx/headsmp.S | 1 |
1 files changed, 1 insertions, 0 deletions
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 <linux/linkage.h> .align 3 + .arm /* It runs from physical address */ ENTRY(zx_resume_jump) |