Revert "workqueue: make sure delayed work run in local cpu"

This reverts commit d14219f.
khusika · Jun 15, 2018 · 6bd8a4c · 6bd8a4c
1 parent e250c4f
commit 6bd8a4c
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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);
 }
 
 /**