---

yaml --- r: 273243 b: refs/heads/master c: 0a619e5 h: refs/heads/master i: 273241: c72b804 273239: 4dbab15 v: v3
git-mirror · Nov 2, 2011 · 671e651 · 671e651
1 parent 98cc340
commit 671e651
Show file tree

Hide file tree

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