diff options
| author | Valentin Schneider <vschneid@redhat.com> | 2023-01-13 20:40:40 +0300 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2023-01-13 20:50:40 +0300 |
| commit | c63a2e52d5e08f01140d7b76c08a78e15e801f03 (patch) | |
| tree | 8398879012c1de0c1bbb71cfd147baf28c5abe63 /kernel/workqueue.c | |
| parent | e02b93124855cd34b78e61ae44846c8cb5fddfc3 (diff) | |
| download | linux-c63a2e52d5e08f01140d7b76c08a78e15e801f03.tar.xz | |
workqueue: Fold rebind_worker() within rebind_workers()
!CONFIG_SMP builds complain about rebind_worker() being unused. Its only
user, rebind_workers() is indeed only defined for CONFIG_SMP, so just fold
the two lines back up there.
Link: http://lore.kernel.org/r/20230113143102.2e94d74f@canb.auug.org.au
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Valentin Schneider <vschneid@redhat.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel/workqueue.c')
| -rw-r--r-- | kernel/workqueue.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 5dc67aa9d696..b8b541caed48 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -1990,12 +1990,6 @@ static void unbind_worker(struct worker *worker) WARN_ON_ONCE(set_cpus_allowed_ptr(worker->task, cpu_possible_mask) < 0); } -static void rebind_worker(struct worker *worker, struct worker_pool *pool) -{ - kthread_set_per_cpu(worker->task, pool->cpu); - WARN_ON_ONCE(set_cpus_allowed_ptr(worker->task, pool->attrs->cpumask) < 0); -} - static void wake_dying_workers(struct list_head *cull_list) { struct worker *worker, *tmp; @@ -5192,8 +5186,11 @@ static void rebind_workers(struct worker_pool *pool) * of all workers first and then clear UNBOUND. As we're called * from CPU_ONLINE, the following shouldn't fail. */ - for_each_pool_worker(worker, pool) - rebind_worker(worker, pool); + for_each_pool_worker(worker, pool) { + kthread_set_per_cpu(worker->task, pool->cpu); + WARN_ON_ONCE(set_cpus_allowed_ptr(worker->task, + pool->attrs->cpumask) < 0); + } raw_spin_lock_irq(&pool->lock); |