git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
7437e7d
)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
author
Linus Torvalds
<torvalds@linux-foundation.org>
Wed, 5 May 2010 14:56:36 +0000
(07:56 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Wed, 5 May 2010 14:56:36 +0000
(07:56 -0700)
* '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
kernel/workqueue.c
patch
|
blob
|
history
diff --git
a/kernel/workqueue.c
b/kernel/workqueue.c
index
dee4865
..
5bfb213
100644
(file)
--- 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();
}