---

yaml --- r: 276843 b: refs/heads/master c: a41c58a h: refs/heads/master i: 276841: 0594e01 276839: b53abca v: v3
git-mirror · Dec 20, 2011 · e5f9e5f · e5f9e5f
1 parent c38df4c
commit e5f9e5f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 481fe17e973fb97aa3edf17c69557afe88d8334f
+refs/heads/master: a41c58a6665cc995e237303b05db42100b71b65e
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
@@ -4907,9 +4907,9 @@ mem_cgroup_create(struct cgroup_subsys *ss, struct cgroup *cont)
 		int cpu;
 		enable_swap_cgroup();
 		parent = NULL;
-		root_mem_cgroup = memcg;
 		if (mem_cgroup_soft_limit_tree_init())
 			goto free_out;
+		root_mem_cgroup = memcg;
 		for_each_possible_cpu(cpu) {
 			struct memcg_stock_pcp *stock =
 						&per_cpu(memcg_stock, cpu);
@@ -4948,7 +4948,6 @@ mem_cgroup_create(struct cgroup_subsys *ss, struct cgroup *cont)
 	return &memcg->css;
 free_out:
 	__mem_cgroup_free(memcg);
-	root_mem_cgroup = NULL;
 	return ERR_PTR(error);
 }