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.