Skip to content

Commit

Permalink
ARM: zx: fix building with CONFIG_THUMB2_KERNEL
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
arndb committed May 22, 2015
1 parent ac0b209 commit 993198a
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions arch/arm/mach-zx/headsmp.S
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <linux/linkage.h>

.align 3
.arm

/* It runs from physical address */
ENTRY(zx_resume_jump)
Expand Down

0 comments on commit 993198a

Please sign in to comment.