diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-05 16:56:36 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-05 16:56:36 +0200 |
| commit | 8777c793d6a24c7f3adf52b1b1086e9706de4589 (patch) | |
| tree | 87817c46c895307df4f9188e7f13d1f18b0eb01e /kernel | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | workqueue: flush_delayed_work: keep the original workqueue for re-queueing (diff) | |
| download | linux-8777c793d6a24c7f3adf52b1b1086e9706de4589.tar.xz linux-8777c793d6a24c7f3adf52b1b1086e9706de4589.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
workqueue: flush_delayed_work: keep the original workqueue for re-queueing
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/workqueue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index dee48658805c..5bfb213984b2 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -774,7 +774,7 @@ void flush_delayed_work(struct delayed_work *dwork) { if (del_timer_sync(&dwork->timer)) { struct cpu_workqueue_struct *cwq; - cwq = wq_per_cpu(keventd_wq, get_cpu()); + cwq = wq_per_cpu(get_wq_data(&dwork->work)->wq, get_cpu()); __queue_work(cwq, &dwork->work); put_cpu(); } |