From 6bd8a4c5bc48ac297275649457beec283862fa0a Mon Sep 17 00:00:00 2001 From: khusika Date: Sun, 10 Jun 2018 08:16:32 +0700 Subject: [PATCH] Revert "workqueue: make sure delayed work run in local cpu" This reverts commit d14219f9abe9ac2e498726ed7c02afcdf2fd1791. --- kernel/workqueue.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index e7c368e5358e..8187ac0da4d4 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -1473,13 +1473,13 @@ static void __queue_delayed_work(int cpu, struct workqueue_struct *wq, timer_stats_timer_set_start_info(&dwork->timer); dwork->wq = wq; - /* timer isn't guaranteed to run in this cpu, record earlier */ - if (cpu == WORK_CPU_UNBOUND) - cpu = raw_smp_processor_id(); dwork->cpu = cpu; timer->expires = jiffies + delay; - add_timer_on(timer, cpu); + if (unlikely(cpu != WORK_CPU_UNBOUND)) + add_timer_on(timer, cpu); + else + add_timer(timer); } /**