ARM: 8314/1: replace PROCINFO embedded branch with relative offset

This patch replaces the 'branch to setup()' instructions embedded
in the PROCINFO structs with the offset to that setup function
relative to the base of the struct. This preserves the position
independent nature of that field, but uses a data item rather
than an instruction.

This is mainly done to prevent linker failures on large kernels,
where the setup function is out of reach for the branch.

Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 7 insertions, 7 deletions

diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 01963273c07a..3637973a9708 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -138,9 +138,9 @@ ENTRY(stext)
                                                 @ mmu has been enabled
         adr     lr, BSYM(1f)                    @ return (PIC) address
         mov     r8, r4                          @ set TTBR1 to swapper_pg_dir
- ARM(   add     pc, r10, #PROCINFO_INITFUNC     )
- THUMB( add     r12, r10, #PROCINFO_INITFUNC    )
- THUMB( ret     r12                             )
+        ldr     r12, [r10, #PROCINFO_INITFUNC]
+        add     r12, r12, r10
+        ret     r12
 1:      b       __enable_mmu
 ENDPROC(stext)
         .ltorg
@@ -386,10 +386,10 @@ ENTRY(secondary_startup)
         ldr     r8, [r7, lr]                    @ get secondary_data.swapper_pg_dir
         adr     lr, BSYM(__enable_mmu)          @ return address
         mov     r13, r12                        @ __secondary_switched address
- ARM(   add     pc, r10, #PROCINFO_INITFUNC     ) @ initialise processor
-                                                  @ (return control reg)
- THUMB( add     r12, r10, #PROCINFO_INITFUNC    )
- THUMB( ret     r12                             )
+        ldr     r12, [r10, #PROCINFO_INITFUNC]
+        add     r12, r12, r10                   @ initialise processor
+                                                @ (return control reg)
+        ret     r12
 ENDPROC(secondary_startup)
 ENDPROC(secondary_startup_arm)