aboutsummaryrefslogtreecommitdiffstats
path: root/mm/memcontrol.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/memcontrol.c')
-rw-r--r--mm/memcontrol.c8
1 files changed, 5 insertions, 3 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)
808 } 808 }
809 unlock_page_cgroup(pc); 809 unlock_page_cgroup(pc);
810 if (mem) { 810 if (mem) {
811 ret = mem_cgroup_charge_common(newpage, NULL, GFP_KERNEL, 811 ret = mem_cgroup_charge_common(newpage, NULL,
812 ctype, mem); 812 GFP_HIGHUSER_MOVABLE,
813 ctype, mem);
813 css_put(&mem->css); 814 css_put(&mem->css);
814 } 815 }
815 return ret; 816 return ret;
@@ -889,7 +890,8 @@ static int mem_cgroup_resize_limit(struct mem_cgroup *memcg,
889 ret = -EBUSY; 890 ret = -EBUSY;
890 break; 891 break;
891 } 892 }
892 progress = try_to_free_mem_cgroup_pages(memcg, GFP_KERNEL); 893 progress = try_to_free_mem_cgroup_pages(memcg,
894 GFP_HIGHUSER_MOVABLE);
893 if (!progress) 895 if (!progress)
894 retry_count--; 896 retry_count--;
895 } 897 }