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 7a839a5e215bd51d7e464f4c1f0d90f8b5d56ff2..c6faa329b88b07a7d8b9256ed813eb4928c99931 100644 (file)
--- 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;
 }