diff options
| author | Olof Johansson <olof@lixom.net> | 2013-08-04 23:41:57 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-08-04 23:42:54 +0400 |
| commit | 3bd957978bb50390bb07678bc4c125989e9a81a2 (patch) | |
| tree | 0fe14d779016e75b07a43bf48a7567ebda6507e9 /arch/arm/mach-shmobile/headsmp.S | |
| parent | ad81f0545ef01ea651886dddac4bef6cec930092 (diff) | |
| parent | 93d8a6fbe69a629a7bb37bb546699a5c49963dc5 (diff) | |
| download | linux-3bd957978bb50390bb07678bc4c125989e9a81a2.tar.xz | |
Merge tag 'renesas-fixes-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/fixes-non-critical
From Simon Horman:
Renesas ARM based SoC fixes for v3.12
* Fix TPU clock name for r8a7740 SoC
* Update romImage to relocate appended DTB
* Thumb fixes
* tag 'renesas-fixes-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: r8a7740: Fix TPU clock name
ARM: shmobile: Insert align directives before 4 bytes data
ARM: shmobile: Force ARM mode to compile reset vector for secondary CPUs
ARM: shmobile: fix compile error when CONFIG_THUMB2_KERNEL=y
ARM: shmobile: Update romImage to relocate appended DTB
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-shmobile/headsmp.S')
| -rw-r--r-- | arch/arm/mach-shmobile/headsmp.S | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/headsmp.S b/arch/arm/mach-shmobile/headsmp.S index 559d1ce5f57e..dfb41dfc8948 100644 --- a/arch/arm/mach-shmobile/headsmp.S +++ b/arch/arm/mach-shmobile/headsmp.S @@ -26,12 +26,16 @@ ENDPROC(shmobile_invalidate_start) * This will be mapped at address 0 by SBAR register. * We need _long_ jump to the physical address. */ + .arm .align 12 ENTRY(shmobile_boot_vector) ldr r0, 2f - ldr pc, 1f + ldr r1, 1f + bx r1 + ENDPROC(shmobile_boot_vector) + .align 2 .globl shmobile_boot_fn shmobile_boot_fn: 1: .space 4 |