[RFC 2/5] ARM: P2V: avoid initializers and assembly using PHYS_OFFSET
From: Kukjin Kim <hidden>
Date: 2011-02-17 05:36:19
Also in:
linux-arm-msm, linux-samsung-soc
Russell King - ARM Linux wrote:
quoted hunk ↗ jump to hunk
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. Signed-off-by: Russell King <redacted> --- arch/arm/kernel/setup.c | 4 +++- arch/arm/mach-msm/board-msm7x27.c | 8 ++++---- arch/arm/mach-msm/board-msm7x30.c | 6 +++--- arch/arm/mach-msm/board-qsd8x50.c | 4 ++-- arch/arm/mach-msm/board-sapphire.c | 2 +- arch/arm/mach-mx5/board-cpuimx51.c | 2 +- arch/arm/mach-mx5/board-cpuimx51sd.c | 2 +- arch/arm/mach-mx5/board-mx51_3ds.c | 2 +- arch/arm/mach-pxa/balloon3.c | 2 +- arch/arm/mach-realview/realview_eb.c | 2 +- arch/arm/mach-realview/realview_pb1176.c | 2 +- arch/arm/mach-realview/realview_pb11mp.c | 2 +- arch/arm/mach-realview/realview_pba8.c | 2 +- arch/arm/mach-realview/realview_pbx.c | 2 +- arch/arm/mach-s5pv210/sleep.S | 2 +- arch/arm/mach-tcc8k/board-tcc8000-sdk.c | 2 +- arch/arm/mach-vexpress/ct-ca9x4.c | 2 +- 17 files changed, 25 insertions(+), 23 deletions(-)diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 3455ad3..f67e682 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c@@ -705,7 +705,7 @@ static struct init_tags { { tag_size(tag_core), ATAG_CORE }, { 1, PAGE_SIZE, 0xff }, { tag_size(tag_mem32), ATAG_MEM }, - { MEM_SIZE, PHYS_OFFSET }, + { MEM_SIZE }, { 0, ATAG_NONE } };@@ -804,6 +804,8 @@ void __init setup_arch(char **cmdline_p) struct machine_desc *mdesc; char *from = default_command_line; + tags->mem.start = PHYS_OFFSET; + unwind_init(); setup_processor();
(snip)
quoted hunk ↗ jump to hunk
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]
(snip)
-- 1.6.2.5
Acked-by: Kukjin Kim <redacted> Thanks. Best regards, Kgene. -- Kukjin Kim [off-list ref], Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.