diff --git a/[refs] b/[refs] index efdb0d49ab52..c3f5fc7e3444 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 85e72aa5384b1a614563ad63257ded0e91d1a620 +refs/heads/master: 6568d4a9c9ff16d6c4f0b14dfea567806ce579e4 diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c index 3dbff4dcde35..4baddbae94cc 100644 --- a/trunk/mm/memcontrol.c +++ b/trunk/mm/memcontrol.c @@ -3247,7 +3247,7 @@ int mem_cgroup_prepare_migration(struct page *page, ctype = MEM_CGROUP_CHARGE_TYPE_CACHE; else ctype = MEM_CGROUP_CHARGE_TYPE_SHMEM; - __mem_cgroup_commit_charge(memcg, page, 1, pc, ctype); + __mem_cgroup_commit_charge(memcg, newpage, 1, pc, ctype); return ret; }