Skip to content

Commit 3ac36aa

Browse files
jbeulichrppt
authored andcommitted
x86/mm/numa: Use NUMA_NO_NODE when calling memblock_set_node()
memblock_set_node() warns about using MAX_NUMNODES, see e0eec24 ("memblock: make memblock_set_node() also warn about use of MAX_NUMNODES") for details. Reported-by: Narasimhan V <[email protected]> Signed-off-by: Jan Beulich <[email protected]> Cc: [email protected] [bp: commit message] Signed-off-by: Borislav Petkov (AMD) <[email protected]> Reviewed-by: Mike Rapoport (IBM) <[email protected]> Tested-by: Paul E. McKenney <[email protected]> Link: https://lore.kernel.org/r/[email protected] Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mike Rapoport (IBM) <[email protected]>
1 parent e0eec24 commit 3ac36aa

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

arch/x86/mm/numa.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ static void __init numa_clear_kernel_node_hotplug(void)
493493
for_each_reserved_mem_region(mb_region) {
494494
int nid = memblock_get_region_node(mb_region);
495495

496-
if (nid != MAX_NUMNODES)
496+
if (nid != NUMA_NO_NODE)
497497
node_set(nid, reserved_nodemask);
498498
}
499499

@@ -614,9 +614,9 @@ static int __init numa_init(int (*init_func)(void))
614614
nodes_clear(node_online_map);
615615
memset(&numa_meminfo, 0, sizeof(numa_meminfo));
616616
WARN_ON(memblock_set_node(0, ULLONG_MAX, &memblock.memory,
617-
MAX_NUMNODES));
617+
NUMA_NO_NODE));
618618
WARN_ON(memblock_set_node(0, ULLONG_MAX, &memblock.reserved,
619-
MAX_NUMNODES));
619+
NUMA_NO_NODE));
620620
/* In case that parsing SRAT failed. */
621621
WARN_ON(memblock_clear_hotplug(0, ULLONG_MAX));
622622
numa_reset_distance();

0 commit comments

Comments
 (0)