5 files changed, 17 insertions, 10 deletions

diff --git a/mm/memory.c b/mm/memory.c
index b3d73bb1f680..9c6ff7fffdc8 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1715,11 +1715,11 @@ gotten:
         if (unlikely(anon_vma_prepare(vma)))
                 goto oom;
         if (old_page == ZERO_PAGE(address)) {
-                new_page = alloc_zeroed_user_highpage(vma, address);
+                new_page = alloc_zeroed_user_highpage_movable(vma, address);
                 if (!new_page)
                         goto oom;
         } else {
-                new_page = alloc_page_vma(GFP_HIGHUSER, vma, address);
+                new_page = alloc_page_vma(GFP_HIGHUSER_MOVABLE, vma, address);
                 if (!new_page)
                         goto oom;
                 cow_user_page(new_page, old_page, address, vma);
@@ -2237,7 +2237,7 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
 
                 if (unlikely(anon_vma_prepare(vma)))
                         goto oom;
-                page = alloc_zeroed_user_highpage(vma, address);
+                page = alloc_zeroed_user_highpage_movable(vma, address);
                 if (!page)
                         goto oom;
 
@@ -2340,7 +2340,8 @@ retry:
 
                         if (unlikely(anon_vma_prepare(vma)))
                                 goto oom;
-                        page = alloc_page_vma(GFP_HIGHUSER, vma, address);
+                        page = alloc_page_vma(GFP_HIGHUSER_MOVABLE,
+                                                vma, address);
                         if (!page)
                                 goto oom;
                         copy_user_highpage(page, new_page, address, vma);
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 188f8d9c4aed..4c0f99996811 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -594,7 +594,7 @@ static void migrate_page_add(struct page *page, struct list_head *pagelist,
 
 static struct page *new_node_page(struct page *page, unsigned long node, int **x)
 {
-        return alloc_pages_node(node, GFP_HIGHUSER, 0);
+        return alloc_pages_node(node, GFP_HIGHUSER_MOVABLE, 0);
 }
 
 /*
@@ -710,7 +710,8 @@ static struct page *new_vma_page(struct page *page, unsigned long private, int *
 {
         struct vm_area_struct *vma = (struct vm_area_struct *)private;
 
-        return alloc_page_vma(GFP_HIGHUSER, vma, page_address_in_vma(page, vma));
+        return alloc_page_vma(GFP_HIGHUSER_MOVABLE, vma,
+                                        page_address_in_vma(page, vma));
 }
 #else
 
diff --git a/mm/migrate.c b/mm/migrate.c
index a91ca00abebe..34d8ada053e4 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -761,7 +761,8 @@ static struct page *new_page_node(struct page *p, unsigned long private,
 
         *result = &pm->status;
 
-        return alloc_pages_node(pm->node, GFP_HIGHUSER | GFP_THISNODE, 0);
+        return alloc_pages_node(pm->node,
+                                GFP_HIGHUSER_MOVABLE | GFP_THISNODE, 0);
 }
 
 /*
diff --git a/mm/shmem.c b/mm/shmem.c
index 0493e4d0bcaa..e49181d9d893 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -93,8 +93,11 @@ static inline struct page *shmem_dir_alloc(gfp_t gfp_mask)
          * The above definition of ENTRIES_PER_PAGE, and the use of
          * BLOCKS_PER_PAGE on indirect pages, assume PAGE_CACHE_SIZE:
          * might be reconsidered if it ever diverges from PAGE_SIZE.
+         *
+         * __GFP_MOVABLE is masked out as swap vectors cannot move
          */
-        return alloc_pages(gfp_mask, PAGE_CACHE_SHIFT-PAGE_SHIFT);
+        return alloc_pages((gfp_mask & ~__GFP_MOVABLE) | __GFP_ZERO,
+                                PAGE_CACHE_SHIFT-PAGE_SHIFT);
 }
 
 static inline void shmem_dir_free(struct page *page)
@@ -372,7 +375,7 @@ static swp_entry_t *shmem_swp_alloc(struct shmem_inode_info *info, unsigned long
                 }
 
                 spin_unlock(&info->lock);
-                page = shmem_dir_alloc(mapping_gfp_mask(inode->i_mapping) | __GFP_ZERO);
+                page = shmem_dir_alloc(mapping_gfp_mask(inode->i_mapping));
                 if (page)
                         set_page_private(page, 0);
                 spin_lock(&info->lock);
diff --git a/mm/swap_state.c b/mm/swap_state.c
index 925d5c50f18d..67daecb6031a 100644
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -334,7 +334,8 @@ struct page *read_swap_cache_async(swp_entry_t entry,
                  * Get a new page to read into from swap.
                  */
                 if (!new_page) {
-                        new_page = alloc_page_vma(GFP_HIGHUSER, vma, addr);
+                        new_page = alloc_page_vma(GFP_HIGHUSER_MOVABLE,
+                                                                vma, addr);
                         if (!new_page)
                                 break;          /* Out of memory */
                 }