---

yaml --- r: 311109 b: refs/heads/master c: 3a981f4 h: refs/heads/master i: 311107: 40690be v: v3
git-mirror · Jun 20, 2012 · 88cb87d · 88cb87d
1 parent aa4fad9
commit 88cb87d
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: 61eafb00d55dfbccdfce543c6b60e369ff4f8f18
+refs/heads/master: 3a981f482cc29f7d0aeab509e51ea15519a6e961
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
@@ -1148,7 +1148,7 @@ bool __mem_cgroup_same_or_subtree(const struct mem_cgroup *root_memcg,
 {
 	if (root_memcg == memcg)
 		return true;
-	if (!root_memcg->use_hierarchy)
+	if (!root_memcg->use_hierarchy || !memcg)
 		return false;
 	return css_is_ancestor(&memcg->css, &root_memcg->css);
 }