]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
s390/numa: let NODES_SHIFT depend on NEED_MULTIPLE_NODES
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Wed, 10 Jun 2020 08:36:05 +0000 (10:36 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 24 Jun 2020 15:49:15 +0000 (17:49 +0200)
commitccf0cca97fa66db796c0b9be3520013f5193eb78
tree5f5100c3fc706f818ea3d254e0978c83fa103798
parent749911b61da658530ca8951d46490d1ea3e0b778
s390/numa: let NODES_SHIFT depend on NEED_MULTIPLE_NODES

[ 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