From 70dc7cefe14fcafd9ad434f00e5d38b503489f17 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Thu, 12 Nov 2009 17:03:28 +0900
Subject: [PATCH] --- yaml --- r: 173491 b: refs/heads/master c:
 3af539e59cf3213cbe31ce7008f1db51c52665ca h: refs/heads/master i:   173489:
 2daab8ad4e4bbf0916dee599bc25fb83f13f2ca8   173487:
 c407041022a74c52b1d267e6bf81048402ae791a v: v3

---
 [refs]                       | 2 +-
 trunk/arch/sh/mm/cache-sh5.c | 2 +-
 trunk/arch/sh/mm/cache.c     | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b12ca71b4c7d..8c1bdc850256 100644
--- 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
index 467ff8e260f7..eb4cc4ec7952 100644
--- 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
index 63c132998f24..e9415d3ea94a 100644
--- 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);