4 files changed, 14 insertions, 11 deletions

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index f568b1964551..c34eb52bdc3f 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -808,8 +808,9 @@ int mem_cgroup_prepare_migration(struct page *page, struct page *newpage)
         }
         unlock_page_cgroup(pc);
         if (mem) {
-                ret = mem_cgroup_charge_common(newpage, NULL, GFP_KERNEL,
-                        ctype, mem);
+                ret = mem_cgroup_charge_common(newpage, NULL,
+                                        GFP_HIGHUSER_MOVABLE,
+                                        ctype, mem);
                 css_put(&mem->css);
         }
         return ret;
@@ -889,7 +890,8 @@ static int mem_cgroup_resize_limit(struct mem_cgroup *memcg,
                         ret = -EBUSY;
                         break;
                 }
-                progress = try_to_free_mem_cgroup_pages(memcg, GFP_KERNEL);
+                progress = try_to_free_mem_cgroup_pages(memcg,
+                                GFP_HIGHUSER_MOVABLE);
                 if (!progress)
                         retry_count--;
         }
diff --git a/mm/memory.c b/mm/memory.c
index 7f210f160990..ba5189e322e6 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2000,7 +2000,7 @@ gotten:
         cow_user_page(new_page, old_page, address, vma);
         __SetPageUptodate(new_page);
 
-        if (mem_cgroup_newpage_charge(new_page, mm, GFP_KERNEL))
+        if (mem_cgroup_newpage_charge(new_page, mm, GFP_HIGHUSER_MOVABLE))
                 goto oom_free_new;
 
         /*
@@ -2431,7 +2431,7 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
         lock_page(page);
         delayacct_clear_flag(DELAYACCT_PF_SWAPIN);
 
-        if (mem_cgroup_try_charge(mm, GFP_KERNEL, &ptr) == -ENOMEM) {
+        if (mem_cgroup_try_charge(mm, GFP_HIGHUSER_MOVABLE, &ptr) == -ENOMEM) {
                 ret = VM_FAULT_OOM;
                 unlock_page(page);
                 goto out;
@@ -2512,7 +2512,7 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
                 goto oom;
         __SetPageUptodate(page);
 
-        if (mem_cgroup_newpage_charge(page, mm, GFP_KERNEL))
+        if (mem_cgroup_newpage_charge(page, mm, GFP_HIGHUSER_MOVABLE))
                 goto oom_free_page;
 
         entry = mk_pte(page, vma->vm_page_prot);
@@ -2603,7 +2603,8 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
                                 ret = VM_FAULT_OOM;
                                 goto out;
                         }
-                        if (mem_cgroup_newpage_charge(page, mm, GFP_KERNEL)) {
+                        if (mem_cgroup_newpage_charge(page,
+                                                mm, GFP_HIGHUSER_MOVABLE)) {
                                 ret = VM_FAULT_OOM;
                                 page_cache_release(page);
                                 goto out;
diff --git a/mm/shmem.c b/mm/shmem.c
index 5941f9801363..bd9b4ea307b2 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -928,8 +928,8 @@ found:
         error = 1;
         if (!inode)
                 goto out;
-        /* Precharge page using GFP_KERNEL while we can wait */
-        error = mem_cgroup_cache_charge(page, current->mm, GFP_KERNEL);
+        /* Charge page using GFP_HIGHUSER_MOVABLE while we can wait */
+        error = mem_cgroup_cache_charge(page, current->mm, GFP_HIGHUSER_MOVABLE);
         if (error)
                 goto out;
         error = radix_tree_preload(GFP_KERNEL);
@@ -1379,7 +1379,7 @@ repeat:
 
                         /* Precharge page while we can wait, compensate after */
                         error = mem_cgroup_cache_charge(filepage, current->mm,
-                                                        gfp & ~__GFP_HIGHMEM);
+                                        GFP_HIGHUSER_MOVABLE);
                         if (error) {
                                 page_cache_release(filepage);
                                 shmem_unacct_blocks(info->flags, 1);
diff --git a/mm/swapfile.c b/mm/swapfile.c
index fb926efb5167..ddc6d92be2cb 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -695,7 +695,7 @@ static int unuse_pte(struct vm_area_struct *vma, pmd_t *pmd,
         pte_t *pte;
         int ret = 1;
 
-        if (mem_cgroup_try_charge(vma->vm_mm, GFP_KERNEL, &ptr))
+        if (mem_cgroup_try_charge(vma->vm_mm, GFP_HIGHUSER_MOVABLE, &ptr))
                 ret = -ENOMEM;
 
         pte = pte_offset_map_lock(vma->vm_mm, pmd, addr, &ptl);