summaryrefslogtreecommitdiff
path: root/arch/sh/mm/cache.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-09-08 16:21:00 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-09-08 16:21:00 +0900
commit6e4154d4c2dd3d7e61d19ddd2527322ce34c2f5a (patch)
tree5c5eab6df31e0dedefc57eae22251267f234b08c /arch/sh/mm/cache.c
parent0906a3ad33a254094fb74828e3ddb9af8771a6da (diff)
sh: Use more aggressive dcache purging in kmap teardown.
This fixes up a number of outstanding issues observed with old mappings on the same colour hanging around. This requires some more optimal handling, but is a safe fallback until all of the corner cases have been handled. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/mm/cache.c')
-rw-r--r--arch/sh/mm/cache.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/sh/mm/cache.c b/arch/sh/mm/cache.c
index 8e4a8d1ac4a9..35c37b7f717a 100644
--- a/arch/sh/mm/cache.c
+++ b/arch/sh/mm/cache.c
@@ -97,7 +97,7 @@ void copy_user_highpage(struct page *to, struct page *from,
}
if (pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK))
- __flush_wback_region(vto, PAGE_SIZE);
+ __flush_purge_region(vto, PAGE_SIZE);
kunmap_atomic(vto, KM_USER1);
/* Make sure this page is cleared on other CPU's too before using it */
@@ -112,7 +112,7 @@ void clear_user_highpage(struct page *page, unsigned long vaddr)
clear_page(kaddr);
if (pages_do_alias((unsigned long)kaddr, vaddr & PAGE_MASK))
- __flush_wback_region(kaddr, PAGE_SIZE);
+ __flush_purge_region(kaddr, PAGE_SIZE);
kunmap_atomic(kaddr, KM_USER0);
}
@@ -134,7 +134,7 @@ void __update_cache(struct vm_area_struct *vma,
unsigned long addr = (unsigned long)page_address(page);
if (pages_do_alias(addr, address & PAGE_MASK))
- __flush_wback_region((void *)addr, PAGE_SIZE);
+ __flush_purge_region((void *)addr, PAGE_SIZE);
}
}
}
@@ -149,10 +149,11 @@ void __flush_anon_page(struct page *page, unsigned long vmaddr)
void *kaddr;
kaddr = kmap_coherent(page, vmaddr);
- __flush_wback_region((void *)kaddr, PAGE_SIZE);
+ /* XXX.. For now kunmap_coherent() does a purge */
+ /* __flush_purge_region((void *)kaddr, PAGE_SIZE); */
kunmap_coherent(kaddr);
} else
- __flush_wback_region((void *)addr, PAGE_SIZE);
+ __flush_purge_region((void *)addr, PAGE_SIZE);
}
}