---

yaml --- r: 275438 b: refs/heads/master c: 78b425f h: refs/heads/master v: v3
git-mirror · Nov 4, 2011 · 6e1857f · 6e1857f
1 parent ccd0ead
commit 6e1857f
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: 3af1f8a41feab47b232b0c3d3b2322426672480d
+refs/heads/master: 78b425faafb1d36d7759a7d799e1c60671670532
diff --git a/trunk/arch/sh/include/asm/page.h b/trunk/arch/sh/include/asm/page.h
@@ -151,8 +151,13 @@ typedef struct page *pgtable_t;
 #endif /* !__ASSEMBLY__ */
 
 #ifdef CONFIG_UNCACHED_MAPPING
+#if defined(CONFIG_29BIT)
+#define UNCAC_ADDR(addr)	P2SEGADDR(addr)
+#define CAC_ADDR(addr)		P1SEGADDR(addr)
+#else
 #define UNCAC_ADDR(addr)	((addr) - PAGE_OFFSET + uncached_start)
 #define CAC_ADDR(addr)		((addr) - uncached_start + PAGE_OFFSET)
+#endif
 #else
 #define UNCAC_ADDR(addr)	((addr))
 #define CAC_ADDR(addr)		((addr))