diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-04 14:03:16 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-17 18:27:30 -0500 |
commit | b75c178afaa975896e894bb2b6951dc4cd43c977 (patch) | |
tree | e3011acbb5c185497e9d72d406b69e5cc20debd5 /arch/arm/kernel/setup.c | |
parent | f4117ac9e237b74afdf5e001d5ea26a4d15e9847 (diff) |
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/kernel/setup.c')
-rw-r--r-- | arch/arm/kernel/setup.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 78678b07901c..056bf1878f8a 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c | |||
@@ -740,7 +740,7 @@ static struct init_tags { | |||
740 | { tag_size(tag_core), ATAG_CORE }, | 740 | { tag_size(tag_core), ATAG_CORE }, |
741 | { 1, PAGE_SIZE, 0xff }, | 741 | { 1, PAGE_SIZE, 0xff }, |
742 | { tag_size(tag_mem32), ATAG_MEM }, | 742 | { tag_size(tag_mem32), ATAG_MEM }, |
743 | { MEM_SIZE, PHYS_OFFSET }, | 743 | { MEM_SIZE }, |
744 | { 0, ATAG_NONE } | 744 | { 0, ATAG_NONE } |
745 | }; | 745 | }; |
746 | 746 | ||
@@ -839,6 +839,8 @@ void __init setup_arch(char **cmdline_p) | |||
839 | struct machine_desc *mdesc; | 839 | struct machine_desc *mdesc; |
840 | char *from = default_command_line; | 840 | char *from = default_command_line; |
841 | 841 | ||
842 | init_tags.mem.start = PHYS_OFFSET; | ||
843 | |||
842 | unwind_init(); | 844 | unwind_init(); |
843 | 845 | ||
844 | setup_processor(); | 846 | setup_processor(); |