---

yaml --- r: 188836 b: refs/heads/master c: 40d1f00 h: refs/heads/master v: v3
git-mirror · Mar 8, 2010 · 6079435 · 6079435
1 parent 614d6a7
commit 6079435
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8941dad1f12b4e8a87a517ed27f29d0209c817c
+refs/heads/master: 40d1f0048289b1baed859baee06878417fae540e
diff --git a/trunk/arch/sh/mm/uncached.c b/trunk/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;
 }