1 files changed, 27 insertions, 9 deletions

diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 8778f58880c4..ec4a1a950df9 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -87,6 +87,8 @@
 #include <linux/seq_file.h>
 #include <linux/proc_fs.h>
 #include <linux/migrate.h>
+#include <linux/rmap.h>
+#include <linux/security.h>
 
 #include <asm/tlbflush.h>
 #include <asm/uaccess.h>
@@ -587,6 +589,11 @@ static void migrate_page_add(struct page *page, struct list_head *pagelist,
                 isolate_lru_page(page, pagelist);
 }
 
+static struct page *new_node_page(struct page *page, unsigned long node, int **x)
+{
+        return alloc_pages_node(node, GFP_HIGHUSER, 0);
+}
+
 /*
  * Migrate pages from one node to a target node.
  * Returns error or the number of pages not migrated.
@@ -603,11 +610,9 @@ int migrate_to_node(struct mm_struct *mm, int source, int dest, int flags)
         check_range(mm, mm->mmap->vm_start, TASK_SIZE, &nmask,
                         flags | MPOL_MF_DISCONTIG_OK, &pagelist);
 
-        if (!list_empty(&pagelist)) {
-                err = migrate_pages_to(&pagelist, NULL, dest);
-                if (!list_empty(&pagelist))
-                        putback_lru_pages(&pagelist);
-        }
+        if (!list_empty(&pagelist))
+                err = migrate_pages(&pagelist, new_node_page, dest);
+
         return err;
 }
 
@@ -694,6 +699,12 @@ int do_migrate_pages(struct mm_struct *mm,
 
 }
 
+static struct page *new_vma_page(struct page *page, unsigned long private, int **x)
+{
+        struct vm_area_struct *vma = (struct vm_area_struct *)private;
+
+        return alloc_page_vma(GFP_HIGHUSER, vma, page_address_in_vma(page, vma));
+}
 #else
 
 static void migrate_page_add(struct page *page, struct list_head *pagelist,
@@ -706,6 +717,11 @@ int do_migrate_pages(struct mm_struct *mm,
 {
         return -ENOSYS;
 }
+
+static struct page *new_vma_page(struct page *page, unsigned long private)
+{
+        return NULL;
+}
 #endif
 
 long do_mbind(unsigned long start, unsigned long len,
@@ -767,15 +783,13 @@ long do_mbind(unsigned long start, unsigned long len,
                 err = mbind_range(vma, start, end, new);
 
                 if (!list_empty(&pagelist))
-                        nr_failed = migrate_pages_to(&pagelist, vma, -1);
+                        nr_failed = migrate_pages(&pagelist, new_vma_page,
+                                                (unsigned long)vma);
 
                 if (!err && nr_failed && (flags & MPOL_MF_STRICT))
                         err = -EIO;
         }
 
-        if (!list_empty(&pagelist))
-                putback_lru_pages(&pagelist);
-
         up_write(&mm->mmap_sem);
         mpol_free(new);
         return err;
@@ -929,6 +943,10 @@ asmlinkage long sys_migrate_pages(pid_t pid, unsigned long maxnode,
                 goto out;
         }
 
+        err = security_task_movememory(task);
+        if (err)
+                goto out;
+
         err = do_migrate_pages(mm, &old, &new,
                 capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
 out: