The quilt patch titled
Subject: mm/mm_init.c: drop 'nid' parameter from check_for_memory()
has been removed from the -mm tree. Its filename was
mm-mm_initc-drop-nid-parameter-from-check_for_memory.patch
This patch was dropped because it was merged into the mm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Haifeng Xu <haifeng.xu@xxxxxxxxxx>
Subject: mm/mm_init.c: drop 'nid' parameter from check_for_memory()
Date: Wed, 7 Jun 2023 03:24:02 +0000
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@xxxxxxxxxx
Signed-off-by: Haifeng Xu <haifeng.xu@xxxxxxxxxx>
Reviewed-by: Mike Rapoport (IBM) <rppt@xxxxxxxxxx>
Acked-by: Michal Hocko <mhocko@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/mm_init.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/mm/mm_init.c~mm-mm_initc-drop-nid-parameter-from-check_for_memory
+++ a/mm/mm_init.c
@@ -1724,7 +1724,7 @@ static void __init free_area_init_node(i
}
/* 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 *
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
/* 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();
_
Patches currently in -mm which might be from haifeng.xu@xxxxxxxxxx are
mm-memcontrol-do-not-tweak-node-in-mem_cgroup_init.patch
selftests-cgroup-fix-unexpected-failure-on-test_memcg_sock.patch
