diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2016-02-16 18:33:56 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2016-02-17 01:28:39 +0100 |
commit | 8ff97fa31333e8d0f4f7029798d9c7d59359b05c (patch) | |
tree | 23903431f74033ab44908b48b16fb2380478aa10 /arch/arm/mm/proc-v7.S | |
parent | ARM: 8512/1: proc-v7.S: Adjust stack address when XIP_KERNEL (diff) | |
download | linux-8ff97fa31333e8d0f4f7029798d9c7d59359b05c.tar.xz linux-8ff97fa31333e8d0f4f7029798d9c7d59359b05c.zip |
ARM: make the physical-relative calculation more obvious
The physical-relative calculation between the XIP text and data sections
introduced by the previous patch was far from obvious. Let's simplify it
by turning it into a macro which takes the two (virtual) addresses.
This allows us to arrange the calculation in a more obvious manner - we
can make it two sub-expressions which calculate the physical address for
each symbol, and then takes the difference of those physical addresses.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm/proc-v7.S')
-rw-r--r-- | arch/arm/mm/proc-v7.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index 1595fb29ec12..0f8963a7e7d9 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -487,7 +487,7 @@ __errata_finish: .align 2 __v7_setup_stack_ptr: - .word __v7_setup_stack - . + PHYS_OFFSET_FIXUP + .word PHYS_RELATIVE(__v7_setup_stack, .) ENDPROC(__v7_setup) .bss |