leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

Browse Source 
* '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
This commit is contained in:
Linus Torvalds 2010-05-05 07:56:36 -07:00
commit 8777c793d6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/workqueue.c
View File

@ -774,7 +774,7 @@ void flush_delayed_work(struct delayed_work *dwork)
{ {
if (del_timer_sync(&dwork->timer)) { if (del_timer_sync(&dwork->timer)) {
struct cpu_workqueue_struct *cwq; 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); __queue_work(cwq, &dwork->work);
put_cpu(); put_cpu();
} }