From: Heiko Carstens heiko.carstens@de.ibm.com
[ Upstream commit 64438e1bc0cdbe6d30bcdcb976f935eb3c297adc ]
Qian Cai reported: """ When NUMA=n and nr_node_ids=2, in apply_wqattrs_prepare(), it has,
for_each_node(node) { if (wq_calc_node_cpumask(...
where it will trigger a booting warning,
WARNING: workqueue cpumask: online intersect > possible intersect
because it found 2 nodes and wq_numa_possible_cpumask[1] is an empty cpumask. """
Let NODES_SHIFT depend on NEED_MULTIPLE_NODES like it is done on other architectures in order to fix this.
Fixes: 701dc81e7412 ("s390/mm: remove fake numa support") Reported-by: Qian Cai cai@lca.pw Signed-off-by: Heiko Carstens heiko.carstens@de.ibm.com Signed-off-by: Vasily Gorbik gor@linux.ibm.com Signed-off-by: Sasha Levin sashal@kernel.org --- arch/s390/Kconfig | 1 + 1 file changed, 1 insertion(+)
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 2167bce993ff6..ae01be202204b 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -462,6 +462,7 @@ config NUMA
config NODES_SHIFT int + depends on NEED_MULTIPLE_NODES default "1"
config SCHED_SMT