diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-11-12 09:03:28 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-11-12 09:03:28 +0100 |
| commit | 3af539e59cf3213cbe31ce7008f1db51c52665ca (patch) | |
| tree | 6ae7fa174075b524282b64f315884c69e7ec41a5 | |
| parent | sh64: Fix up the CONFIG_GENERIC_BUG=n build. (diff) | |
| download | linux-3af539e59cf3213cbe31ce7008f1db51c52665ca.tar.xz linux-3af539e59cf3213cbe31ce7008f1db51c52665ca.zip | |
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>
| -rw-r--r-- | arch/sh/mm/cache-sh5.c | 2 | ||||
| -rw-r--r-- | arch/sh/mm/cache.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/sh/mm/cache-sh5.c b/arch/sh/mm/cache-sh5.c index 467ff8e260f7..eb4cc4ec7952 100644 --- 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 63c132998f24..e9415d3ea94a 100644 --- 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); |