sh64: Fix up reworked cache op build.

This gets the build fixed up for the sh64 cache enabled case.
Disabling still needs further abstraction for independent I/D-cache
disabling.

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

diff --git a/arch/sh/mm/cache-sh5.c b/arch/sh/mm/cache-sh5.c
index 467ff8e260f7346c9ee3dd86d41305dbc98b4895..eb4cc4ec7952ff97bfaa9fc980d3204b9d2dff52 100644 (file)
--- a/arch/sh/mm/cache-sh5.c
+++ b/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/arch/sh/mm/cache.c b/arch/sh/mm/cache.c
index 63c132998f24f81c5c2975ca87d26c815dad8dd5..e9415d3ea94a652ee9a59031e4aa0ce915324d7f 100644 (file)
--- a/arch/sh/mm/cache.c
+++ b/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);