Commit 3ac36aa7 authored by Jan Beulich's avatar Jan Beulich Committed by Mike Rapoport (IBM)
Browse files

x86/mm/numa: Use NUMA_NO_NODE when calling memblock_set_node() 



memblock_set_node() warns about using MAX_NUMNODES, see

  e0eec24e ("memblock: make memblock_set_node() also warn about use of MAX_NUMNODES")

for details.

Reported-by: default avatarNarasimhan V <Narasimhan.V@amd.com>
Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
Cc: stable@vger.kernel.org
[bp: commit message]
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: default avatarMike Rapoport (IBM) <rppt@kernel.org>
Tested-by: default avatarPaul E. McKenney <paulmck@kernel.org>
Link: https://lore.kernel.org/r/20240603141005.23261-1-bp@kernel.org
Link: https://lore.kernel.org/r/abadb736-a239-49e4-ab42-ace7acdd4278@suse.com


Signed-off-by: default avatarMike Rapoport (IBM) <rppt@kernel.org>
parent e0eec24e

arch/x86/mm/numa.c

+3 −3
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ static void __init numa_clear_kernel_node_hotplug(void) 
	for_each_reserved_mem_region(mb_region) {

		int nid = memblock_get_region_node(mb_region);



		if (nid != MAX_NUMNODES)

		if (nid != NUMA_NO_NODE)

			node_set(nid, reserved_nodemask);

	}
@@ -614,9 +614,9 @@ static int __init numa_init(int (*init_func)(void)) 
	nodes_clear(node_online_map);

	memset(&numa_meminfo, 0, sizeof(numa_meminfo));

	WARN_ON(memblock_set_node(0, ULLONG_MAX, &memblock.memory,

				  MAX_NUMNODES));

				  NUMA_NO_NODE));

	WARN_ON(memblock_set_node(0, ULLONG_MAX, &memblock.reserved,

				  MAX_NUMNODES));

				  NUMA_NO_NODE));

	/* In case that parsing SRAT failed. */

	WARN_ON(memblock_clear_hotplug(0, ULLONG_MAX));

	numa_reset_distance();