mm/mm_init.c: drop 'nid' parameter from check_for_memory()
authorHaifeng Xu <haifeng.xu@shopee.com>
Wed, 7 Jun 2023 03:24:02 +0000 (03:24 +0000)
committerAndrew Morton <akpm@linux-foundation.org>
Mon, 19 Jun 2023 23:19:04 +0000 (16:19 -0700)
The node_id in pgdat has already been set in free_area_init_node(),
so use it internally instead of passing a redundant parameter.

Link: https://lkml.kernel.org/r/20230607032402.4679-1-haifeng.xu@shopee.com
Signed-off-by: Haifeng Xu <haifeng.xu@shopee.com>
Reviewed-by: Mike Rapoport (IBM) <rppt@kernel.org>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/mm_init.c

index 015355d..25a585c 100644 (file)
@@ -1724,7 +1724,7 @@ static void __init free_area_init_node(int nid)
 }
 
 /* Any regular or high memory on that node ? */
-static void check_for_memory(pg_data_t *pgdat, int nid)
+static void check_for_memory(pg_data_t *pgdat)
 {
        enum zone_type zone_type;
 
@@ -1732,9 +1732,9 @@ static void check_for_memory(pg_data_t *pgdat, int nid)
                struct zone *zone = &pgdat->node_zones[zone_type];
                if (populated_zone(zone)) {
                        if (IS_ENABLED(CONFIG_HIGHMEM))
-                               node_set_state(nid, N_HIGH_MEMORY);
+                               node_set_state(pgdat->node_id, N_HIGH_MEMORY);
                        if (zone_type <= ZONE_NORMAL)
-                               node_set_state(nid, N_NORMAL_MEMORY);
+                               node_set_state(pgdat->node_id, N_NORMAL_MEMORY);
                        break;
                }
        }
@@ -1886,7 +1886,7 @@ void __init free_area_init(unsigned long *max_zone_pfn)
                /* Any memory on that node */
                if (pgdat->node_present_pages)
                        node_set_state(nid, N_MEMORY);
-               check_for_memory(pgdat, nid);
+               check_for_memory(pgdat);
        }
 
        memmap_init();