aboutsummaryrefslogtreecommitdiffstats
path: root/mm/memcontrol.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/memcontrol.c')
-rw-r--r--mm/memcontrol.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index da53a252b259..6ef5c53dffcb 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2883,7 +2883,7 @@ static inline int mem_cgroup_move_swap_account(swp_entry_t entry,
2883 * page belongs to. 2883 * page belongs to.
2884 */ 2884 */
2885int mem_cgroup_prepare_migration(struct page *page, 2885int mem_cgroup_prepare_migration(struct page *page,
2886 struct page *newpage, struct mem_cgroup **ptr) 2886 struct page *newpage, struct mem_cgroup **ptr, gfp_t gfp_mask)
2887{ 2887{
2888 struct page_cgroup *pc; 2888 struct page_cgroup *pc;
2889 struct mem_cgroup *mem = NULL; 2889 struct mem_cgroup *mem = NULL;
@@ -2940,7 +2940,7 @@ int mem_cgroup_prepare_migration(struct page *page,
2940 return 0; 2940 return 0;
2941 2941
2942 *ptr = mem; 2942 *ptr = mem;
2943 ret = __mem_cgroup_try_charge(NULL, GFP_KERNEL, ptr, false, PAGE_SIZE); 2943 ret = __mem_cgroup_try_charge(NULL, gfp_mask, ptr, false, PAGE_SIZE);
2944 css_put(&mem->css);/* drop extra refcnt */ 2944 css_put(&mem->css);/* drop extra refcnt */
2945 if (ret || *ptr == NULL) { 2945 if (ret || *ptr == NULL) {
2946 if (PageAnon(page)) { 2946 if (PageAnon(page)) {