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
mariux64 · May 5, 2010 · 8777c79 · 8777c79
2 parents 7437e7d + 47dd5be
commit 8777c79
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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();
 	}