---

yaml --- r: 232415 b: refs/heads/master c: 3d37c4a h: refs/heads/master i: 232413: d22b6d9 232411: 836b962 232407: 6fc1a70 232399: 4d2f3e9 232383: 439ec53 v: v3
git-mirror · Jan 26, 2011 · c64e262 · c64e262
1 parent 3d8c07c
commit c64e262
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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.