Merge branch 'master' into upstream-fixes

1 files changed, 3 insertions, 0 deletions

diff --git a/mm/shmem.c b/mm/shmem.c
index 37eaf42ed2c6..4c5e68e4e9ae 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -46,6 +46,8 @@
 #include <linux/mempolicy.h>
 #include <linux/namei.h>
 #include <linux/ctype.h>
+#include <linux/migrate.h>
+
 #include <asm/uaccess.h>
 #include <asm/div64.h>
 #include <asm/pgtable.h>
@@ -2173,6 +2175,7 @@ static struct address_space_operations shmem_aops = {
         .prepare_write  = shmem_prepare_write,
         .commit_write   = simple_commit_write,
 #endif
+        .migratepage    = migrate_page,
 };
 
 static struct file_operations shmem_file_operations = {