diff options
author | Stuart Menefy <stuart.menefy@st.com> | 2007-11-30 03:52:53 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-01-27 23:18:59 -0500 |
commit | d02b08f6e8b184ffef349e395210a5e82ff4f4bc (patch) | |
tree | 1dbec9fe6d2315a95855ce5a91f92a2a1fbf5a22 /arch/sh/kernel/setup.c | |
parent | cbaa118ecfd99fc5ed7adbd9c34a30e1c05e3c93 (diff) |
sh: Clean up places that make 29-bit physical assumptions.
Signed-off-by: Stuart Menefy <stuart.menefy@st.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/setup.c')
-rw-r--r-- | arch/sh/kernel/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index 7eb7fdcce0f8..f48ce8e5d0a8 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c | |||
@@ -82,7 +82,7 @@ static int __init early_parse_mem(char *p) | |||
82 | { | 82 | { |
83 | unsigned long size; | 83 | unsigned long size; |
84 | 84 | ||
85 | memory_start = (unsigned long)PAGE_OFFSET+__MEMORY_START; | 85 | memory_start = (unsigned long)__va(__MEMORY_START); |
86 | size = memparse(p, &p); | 86 | size = memparse(p, &p); |
87 | 87 | ||
88 | if (size > __MEMORY_SIZE) { | 88 | if (size > __MEMORY_SIZE) { |
@@ -254,7 +254,7 @@ void __init setup_arch(char **cmdline_p) | |||
254 | data_resource.start = virt_to_phys(_etext); | 254 | data_resource.start = virt_to_phys(_etext); |
255 | data_resource.end = virt_to_phys(_edata)-1; | 255 | data_resource.end = virt_to_phys(_edata)-1; |
256 | 256 | ||
257 | memory_start = (unsigned long)PAGE_OFFSET+__MEMORY_START; | 257 | memory_start = (unsigned long)__va(__MEMORY_START); |
258 | if (!memory_end) | 258 | if (!memory_end) |
259 | memory_end = memory_start + __MEMORY_SIZE; | 259 | memory_end = memory_start + __MEMORY_SIZE; |
260 | 260 | ||