Prev: [104/116] mac80211: Reset dynamic ps timer in Rx path.
Next: [012/156] i2c-i801: Dont use the block buffer for I2C block writes
From: Greg KH on 30 Mar 2010 20:00
2.6.32-stable review patch. If anyone has any objections, please let us know.

------------------

commit 319c2cc761505ee54a9536c5d0b9c2ee3fb33866 upstream.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro(a)renesas.com>
Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro(a)renesas.com>
Signed-off-by: Paul Mundt <lethal(a)linux-sh.org>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

---
arch/sh/boot/compressed/misc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/sh/boot/compressed/misc.c
+++ b/arch/sh/boot/compressed/misc.c
@@ -132,7 +132,7 @@ void decompress_kernel(void)
output_addr = (CONFIG_MEMORY_START + 0x2000);
#else
output_addr = PHYSADDR((unsigned long)&_text+PAGE_SIZE);
-#ifdef CONFIG_29BIT
+#if defined(CONFIG_29BIT) || defined(CONFIG_PMB_FIXED)
output_addr |= P2SEG;
#endif
#endif


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [104/116] mac80211: Reset dynamic ps timer in Rx path.
Next: [012/156] i2c-i801: Dont use the block buffer for I2C block writes