diff --git a/[refs] b/[refs] index e42f21fb17d6..4802d1ea26ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2ff754fa8f416e82327f2d8f1354a033b66286df +refs/heads/master: 8dba474f034c322d96ada39cb20cac711d80dcb2 diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c index db76ef726293..4fcf47a62550 100644 --- a/trunk/mm/memcontrol.c +++ b/trunk/mm/memcontrol.c @@ -2292,9 +2292,10 @@ static int mem_cgroup_move_parent(struct page_cgroup *pc, ret = mem_cgroup_move_account(pc, child, parent, true, charge); if (ret) mem_cgroup_cancel_charge(parent, charge); -put_back: + if (charge > PAGE_SIZE) compound_unlock_irqrestore(page, flags); +put_back: putback_lru_page(page); put: put_page(page);