summaryrefslogtreecommitdiffstats
path: root/arch/arm/mm
diff options
context:
space:
mode:
authorNicolas Pitre <nico@linaro.org>2016-02-02 00:14:53 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2016-02-16 17:17:49 +0000
commitd78114554939aec0344b494e759d0679224562db (patch)
treea0596003347a6680cb863be11240962d12a82221 /arch/arm/mm
parentdb57f88e4ccbbb6dd194b3f3088b3dc1987db423 (diff)
downloadblackbird-op-linux-d78114554939aec0344b494e759d0679224562db.tar.gz
blackbird-op-linux-d78114554939aec0344b494e759d0679224562db.zip
ARM: 8512/1: proc-v7.S: Adjust stack address when XIP_KERNEL
When XIP_KERNEL is enabled, the virt to phys address translation for RAM is not the same as the virt to phys address translation for .text. The only way to know where physical RAM is located is to use PLAT_PHYS_OFFSET. The MACRO will be useful for other places where there is a similar problem. Signed-off-by: Nicolas Pitre <nico@linaro.org> Signed-off-by: Chris Brandt <chris.brandt@renesas.com> 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 0f92d575a304..1595fb29ec12 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 - .
+ .word __v7_setup_stack - . + PHYS_OFFSET_FIXUP
ENDPROC(__v7_setup)
.bss
OpenPOWER on IntegriCloud