sh: Clean up places that make 29-bit physical assumptions.

[deliverable/linux.git] / arch / sh / boot / compressed / misc_32.c

diff --git a/arch/sh/boot/compressed/misc_32.c b/arch/sh/boot/compressed/misc_32.c
index df65e305acf78b14710efa0ddc32998207fc9fbb..adcea31e663eade000c375f47badafa14189caf8 100644 (file)
--- 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;