diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-04 19:03:16 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-17 23:27:30 +0000 |
| commit | b75c178afaa975896e894bb2b6951dc4cd43c977 (patch) | |
| tree | e3011acbb5c185497e9d72d406b69e5cc20debd5 /arch/arm/mach-s5pv210 | |
| parent | f4117ac9e237b74afdf5e001d5ea26a4d15e9847 (diff) | |
| download | kernel_samsung_smdk4412-b75c178afaa975896e894bb2b6951dc4cd43c977.zip kernel_samsung_smdk4412-b75c178afaa975896e894bb2b6951dc4cd43c977.tar.gz kernel_samsung_smdk4412-b75c178afaa975896e894bb2b6951dc4cd43c977.tar.bz2 | |
ARM: P2V: avoid initializers and assembly using PHYS_OFFSET
As PHYS_OFFSET will be becoming a variable, we can't have it used in
initializers nor assembly code. Replace those in generic code with
a run-time initialization. Replace those in platform code using the
individual platform specific PLAT_PHYS_OFFSET.
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Acked-by: David Brown <davidb@codeaurora.org>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-s5pv210')
| -rw-r--r-- | arch/arm/mach-s5pv210/sleep.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pv210/sleep.S b/arch/arm/mach-s5pv210/sleep.S index d4d222b..2737622 100644 --- a/arch/arm/mach-s5pv210/sleep.S +++ b/arch/arm/mach-s5pv210/sleep.S @@ -65,7 +65,7 @@ resume_with_mmu: /* * After MMU is turned on, restore the previous MMU table. */ - ldr r9 , =(PAGE_OFFSET - PHYS_OFFSET) + ldr r9 , =(PAGE_OFFSET - PLAT_PHYS_OFFSET) add r4, r4, r9 str r12, [r4] |