On Wed, Jul 03, 2024 at 12:39:38PM +0200, Greg Kroah-Hartman wrote: > 5.10-stable review patch. If anyone has any objections, please let me know. > > ------------------ > > From: Jan Beulich <jbeulich@xxxxxxxx> > > [ Upstream commit 3ac36aa7307363b7247ccb6f6a804e11496b2b36 ] > > memblock_set_node() warns about using MAX_NUMNODES, see > > e0eec24e2e19 ("memblock: make memblock_set_node() also warn about use of MAX_NUMNODES") > > for details. This commit was a fix for e0eec24e2e19, it's not needed for kernels before 6.8. > Reported-by: Narasimhan V <Narasimhan.V@xxxxxxx> > Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx> > Cc: stable@xxxxxxxxxxxxxxx > [bp: commit message] > Signed-off-by: Borislav Petkov (AMD) <bp@xxxxxxxxx> > Reviewed-by: Mike Rapoport (IBM) <rppt@xxxxxxxxxx> > Tested-by: Paul E. McKenney <paulmck@xxxxxxxxxx> > Link: https://lore.kernel.org/r/20240603141005.23261-1-bp@xxxxxxxxxx > Link: https://lore.kernel.org/r/abadb736-a239-49e4-ab42-ace7acdd4278@xxxxxxxx > Signed-off-by: Mike Rapoport (IBM) <rppt@xxxxxxxxxx> > Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> > --- > arch/x86/mm/numa.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c > index 62a119170376b..74a117cbbd3c9 100644 > --- a/arch/x86/mm/numa.c > +++ b/arch/x86/mm/numa.c > @@ -523,7 +523,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); > } > > @@ -643,9 +643,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(); > -- > 2.43.0 > > > -- Sincerely yours, Mike.