aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorNobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>2010-02-15 03:37:50 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-04-01 19:01:20 -0400
commit7e4c2095a352835e0ad28b61d839edc34ea2c488 (patch)
tree6ec507dabd6152eb51a73cb483b7d036c97e188e /arch/sh
parent6b485cd307ba56876d20b6d443a02f3cc5bbb7a2 (diff)
sh: Fix zImage boot using fixed PMB.
commit 319c2cc761505ee54a9536c5d0b9c2ee3fb33866 upstream. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/boot/compressed/misc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/boot/compressed/misc.c b/arch/sh/boot/compressed/misc.c
index b51b1fc4baae..d3cc94fcdc36 100644
--- a/arch/sh/boot/compressed/misc.c
+++ b/arch/sh/boot/compressed/misc.c
@@ -132,7 +132,7 @@ void decompress_kernel(void)
132 output_addr = (CONFIG_MEMORY_START + 0x2000); 132 output_addr = (CONFIG_MEMORY_START + 0x2000);
133#else 133#else
134 output_addr = __pa((unsigned long)&_text+PAGE_SIZE); 134 output_addr = __pa((unsigned long)&_text+PAGE_SIZE);
135#ifdef CONFIG_29BIT 135#if defined(CONFIG_29BIT) || defined(CONFIG_PMB_LEGACY)
136 output_addr |= P2SEG; 136 output_addr |= P2SEG;
137#endif 137#endif
138#endif 138#endif