Skip to content

Commit

Permalink
sh64: Fix up reworked cache op build.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paul Mundt committed Nov 12, 2009
1 parent 626ac8e commit 3af539e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion arch/sh/mm/cache-sh5.c
Original file line number Diff 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
6 changes: 5 additions & 1 deletion arch/sh/mm/cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 3af539e

Please sign in to comment.