diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-15 23:59:24 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-15 23:59:24 +0200 |
| commit | bd0704111e625ebe75418531550cf471215c3267 (patch) | |
| tree | e9f59d817acea309ce9b2ddb4574dfeb4e153e5a /kernel | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/iee... (diff) | |
| parent | tty: use the new 'flush_delayed_work()' helper to do ldisc flush (diff) | |
| download | linux-bd0704111e625ebe75418531550cf471215c3267.tar.xz linux-bd0704111e625ebe75418531550cf471215c3267.zip | |
Merge the right tty-fixes branch
* branch 'tty-fixes'
tty: use the new 'flush_delayed_work()' helper to do ldisc flush
workqueue: add 'flush_delayed_work()' to run and wait for delayed work
tty: Make flush_to_ldisc() locking more robust
Diffstat (limited to 'kernel')
| -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 ccefe574dcf7..47cdd7e76f2b 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -647,7 +647,7 @@ EXPORT_SYMBOL(schedule_delayed_work); */ void flush_delayed_work(struct delayed_work *dwork) { - if (del_timer(&dwork->timer)) { + if (del_timer_sync(&dwork->timer)) { struct cpu_workqueue_struct *cwq; cwq = wq_per_cpu(keventd_wq, get_cpu()); __queue_work(cwq, &dwork->work); |