From e5f9e5f17057de4f9374e9f8a13e21fc7dd91f87 Mon Sep 17 00:00:00 2001
From: Hillf Danton <dhillf@gmail.com>
Date: Mon, 19 Dec 2011 17:11:57 -0800
Subject: [PATCH] --- yaml --- r: 276843 b: refs/heads/master c:
 a41c58a6665cc995e237303b05db42100b71b65e h: refs/heads/master i:   276841:
 0594e011ca8eae8330701fd02c2a1bceab8fd88e   276839:
 b53abcaa971549fe16bc2d4ed440f28eb82384ef v: v3

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

diff --git a/[refs] b/[refs]
index 5b6571e7060c..22a61f52199b 100644
--- 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
index 6aff93c98aca..b63f5f7dfa07 100644
--- 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);
 }