aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/workqueue.c')
-rw-r--r--kernel/workqueue.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 646a8b81bee..423c9e37a9e 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -1475,13 +1475,13 @@ static void __queue_delayed_work(int cpu, struct workqueue_struct *wq,
1475 timer_stats_timer_set_start_info(&dwork->timer); 1475 timer_stats_timer_set_start_info(&dwork->timer);
1476 1476
1477 dwork->wq = wq; 1477 dwork->wq = wq;
1478 /* timer isn't guaranteed to run in this cpu, record earlier */
1479 if (cpu == WORK_CPU_UNBOUND)
1480 cpu = raw_smp_processor_id();
1481 dwork->cpu = cpu; 1478 dwork->cpu = cpu;
1482 timer->expires = jiffies + delay; 1479 timer->expires = jiffies + delay;
1483 1480
1484 add_timer_on(timer, cpu); 1481 if (unlikely(cpu != WORK_CPU_UNBOUND))
1482 add_timer_on(timer, cpu);
1483 else
1484 add_timer(timer);
1485} 1485}
1486 1486
1487/** 1487/**