From: Lai Jiangshan <[email protected]> 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 <[email protected]> Tested-by: Paul E. McKenney <[email protected]> Signed-off-by: Lai Jiangshan <[email protected]> --- kernel/workqueue.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index d01cca8e51f9..f2793749bd97 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -5043,6 +5043,7 @@ 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? */ @@ -5050,7 +5051,7 @@ static void restore_unbound_workers_cpumask(struct worker_pool *pool, int cpu) return; /* is @cpu the only online CPU? */ - cpumask_and(&cpumask, pool->attrs->cpumask, cpu_online_mask); + cpumask_and(&cpumask, pool->attrs->cpumask, wq_unbound_online_cpumask); if (cpumask_weight(&cpumask) != 1) return; -- 2.19.1.6.gb485710b
