From 88cb87deeeee751b144d3a8e2d1661cdb0cc46f2 Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hughd@google.com>
Date: Wed, 20 Jun 2012 12:52:58 -0700
Subject: [PATCH] --- yaml --- r: 311109 b: refs/heads/master c:
 3a981f482cc29f7d0aeab509e51ea15519a6e961 h: refs/heads/master i:   311107:
 40690be6e19b17a6ef5cd95fa013e2fdeef4c4f4 v: v3

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

diff --git a/[refs] b/[refs]
index 027e3eeced96..08a19d99a5fc 100644
--- 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
index ac35bccadb7b..f8517cd28feb 100644
--- 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);
 }