From: Igor Mammedov <imammedo@redhat.com>
Date: Wed, 3 Aug 2011 00:53:02 +0000 (+1000)
Subject: Signed-off-by: Igor Mammedov <imammedo@redhat.com>
X-Git-Tag: next-20110824~2^2~10
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=be170866dd1dedc1b412377c98db8a71ea8e23ac;p=karo-tx-linux.git

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 7a839a5e215b..c6faa329b88b 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -4911,7 +4911,6 @@ static int alloc_mem_cgroup_per_zone_info(struct mem_cgroup *mem, int node)
 	if (!pn)
 		return 1;
 
-	mem->info.nodeinfo[node] = pn;
 	for (zone = 0; zone < MAX_NR_ZONES; zone++) {
 		mz = &pn->zoneinfo[zone];
 		for_each_lru(l)
@@ -4920,6 +4919,7 @@ static int alloc_mem_cgroup_per_zone_info(struct mem_cgroup *mem, int node)
 		mz->on_tree = false;
 		mz->mem = mem;
 	}
+	mem->info.nodeinfo[node] = pn;
 	return 0;
 }