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; }