diff --git a/[refs] b/[refs] index 58a93e9b7a91..76a6e9cf7c8b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f2b71f41ee81735c25ef326da9a0610d640abc2 +refs/heads/master: 0e79dedde951e981612ed4e6d74873d61d2a113b diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c index 43a9ade724c7..69af5d5801fc 100644 --- a/trunk/mm/memcontrol.c +++ b/trunk/mm/memcontrol.c @@ -1898,7 +1898,7 @@ void mem_cgroup_update_page_stat(struct page *page, if (unlikely(!memcg || !PageCgroupUsed(pc))) goto out; /* pc->mem_cgroup is unstable ? */ - if (unlikely(mem_cgroup_stealed(memcg)) || PageTransHuge(page)) { + if (unlikely(mem_cgroup_stealed(memcg))) { /* take a lock against to access pc->mem_cgroup */ move_lock_page_cgroup(pc, &flags); need_unlock = true;