summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMarkus Pietrek <Markus.Pietrek@emtrion.de>2009-12-24 15:12:02 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-12-24 15:12:02 +0900
commit76382b5bdb77c29ab430e1b82ef1c604c8dd113b (patch)
tree98a672c96d10f1426eb6d3bc4c525e34a974627c /arch
parent9503e891d28e91961026c778ec251dfe886626fb (diff)
downloadlinux-3.10-76382b5bdb77c29ab430e1b82ef1c604c8dd113b.tar.gz
linux-3.10-76382b5bdb77c29ab430e1b82ef1c604c8dd113b.tar.bz2
linux-3.10-76382b5bdb77c29ab430e1b82ef1c604c8dd113b.zip
sh: Ensure all PG_dcache_dirty pages are written back.
With some of the cache rework an address aliasing optimization was added, but this managed to fail on certain mappings resulting in pages with PG_dcache_dirty set never writing back their dcache lines. This patch reverts to the earlier behaviour of simply always writing back when the dirty bit is set. Signed-off-by: Markus Pietrek <Markus.Pietrek@emtrion.de> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/sh/mm/cache.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/sh/mm/cache.c b/arch/sh/mm/cache.c
index e9415d3ea94..b8607fa7ae1 100644
--- a/arch/sh/mm/cache.c
+++ b/arch/sh/mm/cache.c
@@ -133,12 +133,8 @@ void __update_cache(struct vm_area_struct *vma,
page = pfn_to_page(pfn);
if (pfn_valid(pfn)) {
int dirty = test_and_clear_bit(PG_dcache_dirty, &page->flags);
- if (dirty) {
- unsigned long addr = (unsigned long)page_address(page);
-
- if (pages_do_alias(addr, address & PAGE_MASK))
- __flush_purge_region((void *)addr, PAGE_SIZE);
- }
+ if (dirty)
+ __flush_purge_region(page_address(page), PAGE_SIZE);
}
}