From 78ac3f329233ba994f931097026ebd84cfb744cb Mon Sep 17 00:00:00 2001 From: KAMEZAWA Hiroyuki Date: Tue, 31 Jul 2012 16:42:45 -0700 Subject: [PATCH] --- yaml --- r: 320785 b: refs/heads/master c: 6068bf0104becf07792b2867bc4d17c369419f8b h: refs/heads/master i: 320783: d8e34a349db31ab6c18b1aa6541196b92765ff47 v: v3 --- [refs] | 2 +- trunk/mm/memcontrol.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 58658e73843d..acc8feabf99f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d845aa2c75bcff87dacf098378b5706b12d1588f +refs/heads/master: 6068bf0104becf07792b2867bc4d17c369419f8b diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c index a1f00f0a66cd..964786634746 100644 --- a/trunk/mm/memcontrol.c +++ b/trunk/mm/memcontrol.c @@ -2643,8 +2643,7 @@ static int mem_cgroup_move_account(struct page *page, static int mem_cgroup_move_parent(struct page *page, struct page_cgroup *pc, - struct mem_cgroup *child, - gfp_t gfp_mask) + struct mem_cgroup *child) { struct mem_cgroup *parent; unsigned int nr_pages; @@ -3652,7 +3651,7 @@ static int mem_cgroup_force_empty_list(struct mem_cgroup *memcg, pc = lookup_page_cgroup(page); - ret = mem_cgroup_move_parent(page, pc, memcg, GFP_KERNEL); + ret = mem_cgroup_move_parent(page, pc, memcg); if (ret == -EBUSY || ret == -EINVAL) { /* found lock contention or "pc" is obsolete. */