From c5fc22ca61b571f945f1af5d7e1960f7099b55bd Mon Sep 17 00:00:00 2001
From: Glauber Costa <glommer@parallels.com>
Date: Tue, 12 Feb 2013 13:46:22 -0800
Subject: [PATCH] --- yaml --- r: 349702 b: refs/heads/master c:
 4ba902b5741859a04fdb90d675b9a87721a3fd59 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 17d91d5a014e..9972a269f550 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9977f0f164d46613288e0b5778eae500dfe06f31
+refs/heads/master: 4ba902b5741859a04fdb90d675b9a87721a3fd59
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index 09255ec8159c..fbb60b103e64 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/mm/memcontrol.c
@@ -3030,7 +3030,9 @@ int memcg_register_cache(struct mem_cgroup *memcg, struct kmem_cache *s,
 	if (memcg) {
 		s->memcg_params->memcg = memcg;
 		s->memcg_params->root_cache = root_cache;
-	}
+	} else
+		s->memcg_params->is_root_cache = true;
+
 	return 0;
 }