* [PATCH] workqueue: Fold rebind_worker() within rebind_workers()
@ 2023-01-13 17:40 Valentin Schneider
2023-01-13 17:51 ` Tejun Heo
0 siblings, 1 reply; 2+ messages in thread
From: Valentin Schneider @ 2023-01-13 17:40 UTC (permalink / raw)
To: Linux Kernel Mailing List, Linux Next Mailing List
Cc: Stephen Rothwell, Tejun Heo, Lai Jiangshan
!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>
---
kernel/workqueue.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 0d44c33b5b24e..dce29154cd07a 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -1986,12 +1986,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;
@@ -5149,8 +5143,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);
--
2.31.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-01-13 17:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-13 17:40 [PATCH] workqueue: Fold rebind_worker() within rebind_workers() Valentin Schneider
2023-01-13 17:51 ` Tejun Heo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox