diff options
| author | Sasha Levin <sasha.levin@oracle.com> | 2016-01-25 07:00:06 -0500 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-01-25 07:00:06 -0500 |
| commit | 1eacda6c0dc441384129b5260a485cbb8b4e218a (patch) | |
| tree | 85cc7203c49897b870c77118b7943ab0960bc77c | |
| parent | d25b4531a808bd0faae3dcd0553421d0570373d1 (diff) | |
Revert "workqueue: make sure delayed work run in local cpu"
This reverts commit 1e7af294dd037af63e74fe13e2b6afb93105ed3f.
This commit is only needed on 4.1+
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -rw-r--r-- | kernel/workqueue.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index bd3c41d4ec07..2273f534b01a 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -1442,13 +1442,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); } /** |