From 179dbba79e1f1b56aa879287d3c1fc193e44cb37 Mon Sep 17 00:00:00 2001
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Date: Wed, 21 Mar 2012 16:34:20 -0700
Subject: [PATCH] --- yaml --- r: 292679 b: refs/heads/master c:
 0e79dedde951e981612ed4e6d74873d61d2a113b h: refs/heads/master i:   292677:
 34f784de306177b89ab508a1e3c55828dc219b30   292675:
 ef763f94485a98fd81f225f38a823ba04e022251   292671:
 383ae9b7d6d12942b4f14554a56e194b87b540f6 v: v3

---
 [refs]                | 2 +-
 trunk/mm/memcontrol.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;