1 files changed, 4 insertions, 6 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 455cc3bfae99..6b2324bc61db 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2909,10 +2909,10 @@ static inline void zone_statistics(struct zone *preferred_zone, struct zone *z)
         if (!static_branch_likely(&vm_numa_stat_key))
                 return;
 
-        if (z->node != numa_node_id())
+        if (zone_to_nid(z) != numa_node_id())
                 local_stat = NUMA_OTHER;
 
-        if (z->node == preferred_zone->node)
+        if (zone_to_nid(z) == zone_to_nid(preferred_zone))
                 __inc_numa_state(z, NUMA_HIT);
         else {
                 __inc_numa_state(z, NUMA_MISS);
@@ -5278,7 +5278,7 @@ int local_memory_node(int node)
         z = first_zones_zonelist(node_zonelist(node, GFP_KERNEL),
                                    gfp_zone(GFP_KERNEL),
                                    NULL);
-        return z->zone->node;
+        return zone_to_nid(z->zone);
 }
 #endif
 
@@ -6299,9 +6299,7 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat)
                  * And all highmem pages will be managed by the buddy system.
                  */
                 zone->managed_pages = freesize;
-#ifdef CONFIG_NUMA
-                zone->node = nid;
-#endif
+                zone_set_nid(zone, nid);
                 zone->name = zone_names[j];
                 zone->zone_pgdat = pgdat;
                 spin_lock_init(&zone->lock);