diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2015-03-18 07:29:32 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-03-28 15:46:14 +0000 |
| commit | bf35706f3d0929b413e90b32cf9dd453f200a570 (patch) | |
| tree | 3d2105ed637a1b8cd47e7dd9a66db11a81fe1060 /arch/arm/mm/proc-arm946.S | |
| parent | 0a6a78b8b3c1c1757fbeca4bbf518e44c70c9e4b (diff) | |
| download | linux-stable-bf35706f3d0929b413e90b32cf9dd453f200a570.tar.gz linux-stable-bf35706f3d0929b413e90b32cf9dd453f200a570.tar.bz2 linux-stable-bf35706f3d0929b413e90b32cf9dd453f200a570.zip | |
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>
Diffstat (limited to 'arch/arm/mm/proc-arm946.S')
| -rw-r--r-- | arch/arm/mm/proc-arm946.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/proc-arm946.S b/arch/arm/mm/proc-arm946.S index b3dd9b2d0b8e..c85b40d2117e 100644 --- a/arch/arm/mm/proc-arm946.S +++ b/arch/arm/mm/proc-arm946.S @@ -409,14 +409,14 @@ __arm946_setup: .align - .section ".proc.info.init", #alloc, #execinstr + .section ".proc.info.init", #alloc .type __arm946_proc_info,#object __arm946_proc_info: .long 0x41009460 .long 0xff00fff0 .long 0 .long 0 - b __arm946_setup + initfn __arm946_setup, __arm946_proc_info .long cpu_arch_name .long cpu_elf_name .long HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB |