1 files changed, 25 insertions, 7 deletions

diff --git a/mm/migrate.c b/mm/migrate.c
index 1c2a71aa05cd..20a8c2687b1e 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -616,15 +616,13 @@ static int unmap_and_move(new_page_t get_new_page, unsigned long private,
         /*
          * Establish migration ptes or remove ptes
          */
-        if (try_to_unmap(page, 1) != SWAP_FAIL) {
-                if (!page_mapped(page))
-                        rc = move_to_new_page(newpage, page);
-        } else
-                /* A vma has VM_LOCKED set -> permanent failure */
-                rc = -EPERM;
+        try_to_unmap(page, 1);
+        if (!page_mapped(page))
+                rc = move_to_new_page(newpage, page);
 
         if (rc)
                 remove_migration_ptes(page, page);
+
 unlock:
         unlock_page(page);
 
@@ -743,7 +741,7 @@ static struct page *new_page_node(struct page *p, unsigned long private,
 
         *result = &pm->status;
 
-        return alloc_pages_node(pm->node, GFP_HIGHUSER, 0);
+        return alloc_pages_node(pm->node, GFP_HIGHUSER | GFP_THISNODE, 0);
 }
 
 /*
@@ -976,3 +974,23 @@ out2:
 }
 #endif
 
+/*
+ * Call migration functions in the vma_ops that may prepare
+ * memory in a vm for migration. migration functions may perform
+ * the migration for vmas that do not have an underlying page struct.
+ */
+int migrate_vmas(struct mm_struct *mm, const nodemask_t *to,
+        const nodemask_t *from, unsigned long flags)
+{
+        struct vm_area_struct *vma;
+        int err = 0;
+
+        for(vma = mm->mmap; vma->vm_next && !err; vma = vma->vm_next) {
+                if (vma->vm_ops && vma->vm_ops->migrate) {
+                        err = vma->vm_ops->migrate(vma, to, from, flags);
+                        if (err)
+                                break;
+                }
+        }
+        return err;
+}