From 671e651003e84a4e3e4d6ff63b9463de443683bb Mon Sep 17 00:00:00 2001
From: Igor Mammedov <imammedo@redhat.com>
Date: Wed, 2 Nov 2011 13:38:21 -0700
Subject: [PATCH] --- yaml --- r: 273243 b: refs/heads/master c:
 0a619e58703b86d53d07e938eade9a91a4a863c6 h: refs/heads/master i:   273241:
 c72b804ad6660b9b0f669674658ed9b806f17b25   273239:
 4dbab1592c66117b8c84b0440cd71419e53cae67 v: v3

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

diff --git a/[refs] b/[refs]
index 50e2363931a5..3f3c7f6e0528 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 715a5ee82ab3c07430f748630044354132add5ad
+refs/heads/master: 0a619e58703b86d53d07e938eade9a91a4a863c6
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index c02d87028b9f..f6c4beb4db56 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/mm/memcontrol.c
@@ -4742,7 +4742,6 @@ static int alloc_mem_cgroup_per_zone_info(struct mem_cgroup *memcg, int node)
 	if (!pn)
 		return 1;
 
-	memcg->info.nodeinfo[node] = pn;
 	for (zone = 0; zone < MAX_NR_ZONES; zone++) {
 		mz = &pn->zoneinfo[zone];
 		for_each_lru(l)
@@ -4751,6 +4750,7 @@ static int alloc_mem_cgroup_per_zone_info(struct mem_cgroup *memcg, int node)
 		mz->on_tree = false;
 		mz->mem = memcg;
 	}
+	memcg->info.nodeinfo[node] = pn;
 	return 0;
 }