From c64e2623f1a632b0b93dd5c08094100ae1b08411 Mon Sep 17 00:00:00 2001
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Date: Tue, 25 Jan 2011 15:07:28 -0800
Subject: [PATCH] --- yaml --- r: 232415 b: refs/heads/master c:
 3d37c4a9199920964ffdfaec6335d93b9dcf9ca5 h: refs/heads/master i:   232413:
 d22b6d96e6e2090b39a3030b7800fe9665516a63   232411:
 836b96230fe8b980b4e6d0c4bd6ece1340a73b4e   232407:
 6fc1a702acf7913163011ff32806ec1c4aca21ef   232399:
 4d2f3e93062650871ba3608a74a952bc75c3bc06   232383:
 439ec53991abf55a36d1f3a472cacc5ecd5a3135 v: v3

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

diff --git a/[refs] b/[refs]
index 1fea4ee007aa..6450e4910ecd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01c88e2d6b7330c0cc5867fe2297e7d826e1337d
+refs/heads/master: 3d37c4a9199920964ffdfaec6335d93b9dcf9ca5
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index 1eb1a04f874c..8ab1d42664fb 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/mm/memcontrol.c
@@ -2145,6 +2145,8 @@ void mem_cgroup_split_huge_fixup(struct page *head, struct page *tail)
 	struct page_cgroup *tail_pc = lookup_page_cgroup(tail);
 	unsigned long flags;
 
+	if (mem_cgroup_disabled())
+		return;
 	/*
 	 * We have no races with charge/uncharge but will have races with
 	 * page state accounting.