Commit 8777c793 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 7437e7d3 47dd5be2

kernel/workqueue.c

+1 −1
Original line number Diff line number Diff line
@@ -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();

	}