---

yaml --- r: 173491 b: refs/heads/master c: 3af539e h: refs/heads/master i: 173489: 2daab8a 173487: c407041 v: v3
git-mirror · Nov 12, 2009 · 70dc7ce · 70dc7ce
1 parent 18f8e78
commit 70dc7ce
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 626ac8e1388ac128495a3b7188e9d86464de6c5b
+refs/heads/master: 3af539e59cf3213cbe31ce7008f1db51c52665ca
diff --git a/trunk/arch/sh/mm/cache-sh5.c b/trunk/arch/sh/mm/cache-sh5.c
@@ -563,7 +563,7 @@ static void sh5_flush_cache_page(void *args)
 
 static void sh5_flush_dcache_page(void *page)
 {
-	sh64_dcache_purge_phy_page(page_to_phys(page));
+	sh64_dcache_purge_phy_page(page_to_phys((struct page *)page));
 	wmb();
 }
 

diff --git a/trunk/arch/sh/mm/cache.c b/trunk/arch/sh/mm/cache.c
@@ -277,7 +277,11 @@ static void __init emit_cache_params(void)
 
 void __init cpu_cache_init(void)
 {
-	unsigned int cache_disabled = !(__raw_readl(CCR) & CCR_CACHE_ENABLE);
+	unsigned int cache_disabled = 0;
+
+#ifdef CCR
+	cache_disabled = !(__raw_readl(CCR) & CCR_CACHE_ENABLE);
+#endif
 
 	compute_alias(&boot_cpu_data.icache);
 	compute_alias(&boot_cpu_data.dcache);
-Original file line number
+Diff line change
@@ Expand Up / @@ -563,7 +563,7 @@ static void sh5_flush_cache_page(void *args) @@
     static void sh5_flush_dcache_page(void *page)
     {
-    	sh64_dcache_purge_phy_page(page_to_phys(page));
+    	sh64_dcache_purge_phy_page(page_to_phys((struct page *)page));
     	wmb();
     }
@@ Expand Down @@