aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-05 07:56:36 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-05 07:56:36 -0700
commit8777c793d6a24c7f3adf52b1b1086e9706de4589 (patch)
tree87817c46c895307df4f9188e7f13d1f18b0eb01e
parent7437e7d3672b6d23c08212c68752c9a9c25f8e9e (diff)
parent47dd5be2d6a82b8153e059a1d09eb3879d485bfd (diff)
downloadmrst-s0i3-test-8777c793d6a24c7f3adf52b1b1086e9706de4589.tar.gz
mrst-s0i3-test-8777c793d6a24c7f3adf52b1b1086e9706de4589.tar.xz
mrst-s0i3-test-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
-rw-r--r--kernel/workqueue.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index dee48658805..5bfb213984b 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();
}