From: Lai Jiangshan <la...@linux.alibaba.com> restore_unbound_workers_cpumask() is called when CPU_ONLINE, where wq_online_cpumask equals to cpu_online_mask. So no fucntionality changed.
Acked-by: Tejun Heo <t...@kernel.org> Signed-off-by: Lai Jiangshan <la...@linux.alibaba.com> --- kernel/workqueue.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 84842f10e6a2..eda293097fe1 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -5041,13 +5041,14 @@ static void restore_unbound_workers_cpumask(struct worker_pool *pool, int cpu) static cpumask_t cpumask; struct worker *worker; + lockdep_assert_held(&wq_pool_mutex); lockdep_assert_held(&wq_pool_attach_mutex); /* is @cpu allowed for @pool? */ if (!cpumask_test_cpu(cpu, pool->attrs->cpumask)) return; - cpumask_and(&cpumask, pool->attrs->cpumask, cpu_online_mask); + cpumask_and(&cpumask, pool->attrs->cpumask, wq_online_cpumask); /* is @cpu the first one onlined for the @pool? */ if (cpumask_weight(&cpumask) > 1) -- 2.19.1.6.gb485710b