diff options
| author |   James Morris <jmorris@namei.org> | 2010-05-06 22:21:04 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-05-06 22:21:04 +1000 |
| commit | 043b4d40f53131c5f72eca2a46555fe35328a930 (patch) | |
| tree | 02a40eeb688f7ed9730e26a22f39ad7e04378de2 /kernel/workqueue.c | |
| parent | TOMOYO: Use mutex_lock_interruptible. (diff) | |
| parent | Merge branch 'zerolen' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6 (diff) | |
Merge branch 'master' into next
Conflicts:
security/keys/keyring.c
Resolved conflict with whitespace fix in find_keyring_by_name()
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'kernel/workqueue.c')
| -rw-r--r-- | kernel/workqueue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index dee48658805c..5bfb213984b2 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(); } |