---

yaml --- r: 292679 b: refs/heads/master c: 0e79ded h: refs/heads/master i: 292677: 34f784d 292675: ef763f9 292671: 383ae9b v: v3
git-mirror · Mar 22, 2012 · 179dbba · 179dbba
1 parent 64d7758
commit 179dbba
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;