---

yaml --- r: 349702 b: refs/heads/master c: 4ba902b h: refs/heads/master v: v3
git-mirror · Feb 12, 2013 · c5fc22c · c5fc22c
1 parent 2b1a4ae
commit c5fc22c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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;
 }