diff --git a/[refs] b/[refs] index 137910a9add2..d65d7579803f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 59f002964f4e6668a0132cd796b82f7f8a4803f0 +refs/heads/master: 040f43e0bf70935cbe8a775110206d11367e11db diff --git a/trunk/arch/sh/boot/compressed/misc.c b/trunk/arch/sh/boot/compressed/misc.c index 4eb27e61f8e3..fd56a71ca9d9 100644 --- a/trunk/arch/sh/boot/compressed/misc.c +++ b/trunk/arch/sh/boot/compressed/misc.c @@ -128,9 +128,13 @@ void decompress_kernel(void) { unsigned long output_addr; +#ifdef CONFIG_SUPERH64 + output_addr = (CONFIG_MEMORY_START + 0x2000); +#else output_addr = PHYSADDR((unsigned long)&_text+PAGE_SIZE); #ifdef CONFIG_29BIT output_addr |= P2SEG; +#endif #endif output = (unsigned char *)output_addr;