From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 8 Mar 2010 12:03:21 +0000 (+0900)
Subject: sh: Fix up uncached offset for legacy 29-bit mode.
X-Git-Tag: v2.6.34-rc2~1^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=40d1f0048289b1baed859baee06878417fae540e;p=karo-tx-linux.git

sh: Fix up uncached offset for legacy 29-bit mode.

The uncached_start was being set up properly for 32-bit but managed to
break 29-bit in the process, fix it up.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/arch/sh/mm/uncached.c b/arch/sh/mm/uncached.c
index cf20a5c5136a..2ef57efeb225 100644
--- a/arch/sh/mm/uncached.c
+++ b/arch/sh/mm/uncached.c
@@ -1,6 +1,7 @@
 #include <linux/init.h>
 #include <asm/sizes.h>
 #include <asm/page.h>
+#include <asm/addrspace.h>
 
 /*
  * This is the offset of the uncached section from its cached alias.
@@ -23,7 +24,11 @@ int virt_addr_uncached(unsigned long kaddr)
 
 void __init uncached_init(void)
 {
+#ifdef CONFIG_29BIT
+	uncached_start = P2SEG;
+#else
 	uncached_start = memory_end;
+#endif
 	uncached_end = uncached_start + uncached_size;
 }