diff options
| author | Stuart Menefy <stuart.menefy@st.com> | 2007-11-30 17:52:53 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-01-28 13:18:59 +0900 |
| commit | d02b08f6e8b184ffef349e395210a5e82ff4f4bc (patch) | |
| tree | 1dbec9fe6d2315a95855ce5a91f92a2a1fbf5a22 /arch/sh/boot | |
| parent | cbaa118ecfd99fc5ed7adbd9c34a30e1c05e3c93 (diff) | |
| download | linux-d02b08f6e8b184ffef349e395210a5e82ff4f4bc.tar.gz linux-d02b08f6e8b184ffef349e395210a5e82ff4f4bc.tar.bz2 linux-d02b08f6e8b184ffef349e395210a5e82ff4f4bc.zip | |
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/boot')
| -rw-r--r-- | arch/sh/boot/compressed/misc_32.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/sh/boot/compressed/misc_32.c b/arch/sh/boot/compressed/misc_32.c index df65e305acf7..adcea31e663e 100644 --- a/arch/sh/boot/compressed/misc_32.c +++ b/arch/sh/boot/compressed/misc_32.c @@ -230,7 +230,10 @@ long* stack_start = &user_stack[STACK_SIZE]; void decompress_kernel(void) { output_data = 0; - output_ptr = P2SEGADDR((unsigned long)&_text+PAGE_SIZE); + output_ptr = PHYSADDR((unsigned long)&_text+PAGE_SIZE); +#ifdef CONFIG_29BIT + output_ptr |= P2SEG; +#endif free_mem_ptr = (unsigned long)&_end; free_mem_end_ptr = free_mem_ptr + HEAP_SIZE; |