1 files changed, 16 insertions, 2 deletions

diff --git a/mm/fadvise.c b/mm/fadvise.c
index a47f0f50c89f..909ec558625c 100644
--- a/mm/fadvise.c
+++ b/mm/fadvise.c
@@ -17,6 +17,7 @@
 #include <linux/fadvise.h>
 #include <linux/writeback.h>
 #include <linux/syscalls.h>
+#include <linux/swap.h>
 
 #include <asm/unistd.h>
 
@@ -120,9 +121,22 @@ SYSCALL_DEFINE(fadvise64_64)(int fd, loff_t offset, loff_t len, int advice)
                 start_index = (offset+(PAGE_CACHE_SIZE-1)) >> PAGE_CACHE_SHIFT;
                 end_index = (endbyte >> PAGE_CACHE_SHIFT);
 
-                if (end_index >= start_index)
-                        invalidate_mapping_pages(mapping, start_index,
+                if (end_index >= start_index) {
+                        unsigned long count = invalidate_mapping_pages(mapping,
+                                                start_index, end_index);
+
+                        /*
+                         * If fewer pages were invalidated than expected then
+                         * it is possible that some of the pages were on
+                         * a per-cpu pagevec for a remote CPU. Drain all
+                         * pagevecs and try again.
+                         */
+                        if (count < (end_index - start_index + 1)) {
+                                lru_add_drain_all();
+                                invalidate_mapping_pages(mapping, start_index,
                                                 end_index);
+                        }
+                }
                 break;
         default:
                 ret = -EINVAL;