commit da3faabcb82eb4f1efec5fbe158b2460f756e712 Author: Simon Baatz Date: Mon Nov 14 22:55:51 2011 +0100 - due to problem with mv_cesa and nfs: reverted f8b63c184ad13cc8adc3dadb557d4fbc29f76e4d ARM: 6382/1: Remove superfluous flush_kernel_dcache_page() diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h index d5d8d5c..ce2afa5 100644 --- a/arch/arm/include/asm/cacheflush.h +++ b/arch/arm/include/asm/cacheflush.h @@ -303,6 +303,9 @@ static inline void flush_anon_page(struct vm_area_struct *vma, #define ARCH_HAS_FLUSH_KERNEL_DCACHE_PAGE static inline void flush_kernel_dcache_page(struct page *page) { + /* highmem pages are always flushed upon kunmap already */ + if ((cache_is_vivt() || cache_is_vipt_aliasing()) && !PageHighMem(page)) + __cpuc_flush_dcache_area(page_address(page), PAGE_SIZE); } #define flush_dcache_mmap_lock(mapping) \