Merge tag 'slab-fix-for-6.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab

torvalds · torvalds · commit cb7f5b41f834 · 2023-03-24T10:12:14.000-07:00
Pull slab fix from Vlastimil Babka:
 "A single build fix for a corner case configuration that is apparently
  possible to achieve on some arches, from Geert"

* tag 'slab-fix-for-6.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab:
  mm/slab: Fix undefined init_cache_node_node() for NUMA and !SMP
diff --git a/mm/slab.c b/mm/slab.c
@@ -839,7 +839,7 @@ static int init_cache_node(struct kmem_cache *cachep, int node, gfp_t gfp)
 	return 0;
 }
 
-#if (defined(CONFIG_NUMA) && defined(CONFIG_MEMORY_HOTPLUG)) || defined(CONFIG_SMP)
+#if defined(CONFIG_NUMA) || defined(CONFIG_SMP)
 /*
  * Allocates and initializes node for a node on each slab cache, used for
  * either memory or cpu hotplug.  If memory is being hot-added, the kmem_cache_node

Original file line number	Diff line number	Diff line change
`@@ -839,7 +839,7 @@ static int init_cache_node(struct kmem_cache *cachep, int node, gfp_t gfp)`
`839`	`839`	`return 0;`
`840`	`840`	`}`
`841`	`841`
`842`		`-#if (defined(CONFIG_NUMA) && defined(CONFIG_MEMORY_HOTPLUG)) \|\| defined(CONFIG_SMP)`
	`842`	`+#if defined(CONFIG_NUMA) \|\| defined(CONFIG_SMP)`
`843`	`843`	`/*`
`844`	`844`	`* Allocates and initializes node for a node on each slab cache, used for`
`845`	`845`	`* either memory or cpu hotplug. If memory is being hot-added, the kmem_cache_node`