Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into...

[linux-beck.git] / mm / filemap.c

diff --git a/mm/filemap.c b/mm/filemap.c
index e3736923220e86a6274828e52286c69691ee67be..698ea80f21022bf709dacc1101c614327109d828 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2232,6 +2232,9 @@ again:
                if (unlikely(status))
                        break;
 
+               if (mapping_writably_mapped(mapping))
+                       flush_dcache_page(page);
+
                pagefault_disable();
                copied = iov_iter_copy_from_user_atomic(page, i, offset, bytes);
                pagefault_enable();