aboutsummaryrefslogtreecommitdiff
path: root/arch/mips/mm/cache.c
diff options
context:
space:
mode:
authorPaul Burton <[email protected]>2016-03-01 02:37:58 +0000
committerRalf Baechle <[email protected]>2016-05-13 14:01:58 +0200
commitf4281bba818105c7c91799abe40bc05c0dbdaa25 (patch)
treea9ee001c0fd69795822db6ba78f0a098389710db /arch/mips/mm/cache.c
parent234859e49a15323cf1b2331bdde7f658c4cb45fb (diff)
MIPS: Handle highmem pages in __update_cache
The following patch will expose __update_cache to highmem pages. Handle them by mapping them in for the duration of the cache maintenance, just like in __flush_dcache_page. The code for that isn't shared because we need the page address in __update_cache so sharing became messy. Given that the entirity is an extra 5 lines, just duplicate it. Signed-off-by: Paul Burton <[email protected]> Cc: Lars Persson <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Jerome Marchand <[email protected]> Cc: Kirill A. Shutemov <[email protected]> Cc: [email protected] Cc: [email protected] Cc: stable <[email protected]> # v4.1+ Patchwork: https://patchwork.linux-mips.org/patch/12721/ Signed-off-by: Ralf Baechle <[email protected]>
Diffstat (limited to 'arch/mips/mm/cache.c')
-rw-r--r--arch/mips/mm/cache.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c
index 5a67d8c3decb..8befa55234df 100644
--- a/arch/mips/mm/cache.c
+++ b/arch/mips/mm/cache.c
@@ -149,9 +149,17 @@ void __update_cache(struct vm_area_struct *vma, unsigned long address,
return;
page = pfn_to_page(pfn);
if (page_mapping(page) && Page_dcache_dirty(page)) {
- addr = (unsigned long) page_address(page);
+ if (PageHighMem(page))
+ addr = (unsigned long)kmap_atomic(page);
+ else
+ addr = (unsigned long)page_address(page);
+
if (exec || pages_do_alias(addr, address & PAGE_MASK))
flush_data_cache_page(addr);
+
+ if (PageHighMem(page))
+ __kunmap_atomic((void *)addr);
+
ClearPageDcacheDirty(page);
}
}