From de331bedd756f619f7c44dc6e8091d4ee8d78044 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Mon, 15 Feb 2010 08:37:50 +0000 Subject: [PATCH] --- yaml --- r: 181204 b: refs/heads/master c: 319c2cc761505ee54a9536c5d0b9c2ee3fb33866 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sh/boot/compressed/misc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fb3a0041da3e..6447670a1460 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb1e776050f0f6a7b90eba03a1d001756454f9dc +refs/heads/master: 319c2cc761505ee54a9536c5d0b9c2ee3fb33866 diff --git a/trunk/arch/sh/boot/compressed/misc.c b/trunk/arch/sh/boot/compressed/misc.c index d509a5050623..9ba07927d16a 100644 --- a/trunk/arch/sh/boot/compressed/misc.c +++ b/trunk/arch/sh/boot/compressed/misc.c @@ -117,7 +117,7 @@ void decompress_kernel(void) output_addr = (CONFIG_MEMORY_START + 0x2000); #else output_addr = __pa((unsigned long)&_text+PAGE_SIZE); -#ifdef CONFIG_29BIT +#if defined(CONFIG_29BIT) || defined(CONFIG_PMB_LEGACY) output_addr |= P2SEG; #endif #endif