From 8edcfcbbd131a3580db666ed1034c24d56eb6f5d Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Sat, 15 Aug 2009 09:03:59 +0900 Subject: sh: Bail from kmap_coherent_init() if we have no dcache aliases. This kills off the ifdef from kmap_coherent_init() and just bails if there are no cache aliases. This permits the kmap coherent code to be used on other CPUs. Signed-off-by: Paul Mundt --- arch/sh/mm/pg-mmu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'arch/sh/mm') diff --git a/arch/sh/mm/pg-mmu.c b/arch/sh/mm/pg-mmu.c index 027c4d83fb8..7a6ef34bd49 100644 --- a/arch/sh/mm/pg-mmu.c +++ b/arch/sh/mm/pg-mmu.c @@ -22,13 +22,14 @@ static pte_t *kmap_coherent_pte; void __init kmap_coherent_init(void) { -#if defined(CONFIG_CPU_SH4) || defined(CONFIG_SH7705_CACHE_32KB) unsigned long vaddr; + if (!boot_cpu_data.dcache.n_aliases) + return; + /* cache the first coherent kmap pte */ vaddr = __fix_to_virt(FIX_CMAP_BEGIN); kmap_coherent_pte = kmap_get_fixmap_pte(vaddr); -#endif } static void *kmap_coherent(struct page *page, unsigned long addr) -- cgit v1.2.3