summaryrefslogtreecommitdiff
path: root/arch/arm/mm
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2016-02-16 20:33:56 +0300
committerRussell King <rmk+kernel@arm.linux.org.uk>2016-02-17 03:28:39 +0300
commit8ff97fa31333e8d0f4f7029798d9c7d59359b05c (patch)
tree23903431f74033ab44908b48b16fb2380478aa10 /arch/arm/mm
parentd78114554939aec0344b494e759d0679224562db (diff)
downloadlinux-8ff97fa31333e8d0f4f7029798d9c7d59359b05c.tar.xz
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')
-rw-r--r--arch/arm/mm/proc-v7.S2
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