aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-15 14:59:24 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-15 14:59:24 -0700
commitbd0704111e625ebe75418531550cf471215c3267 (patch)
treee9f59d817acea309ce9b2ddb4574dfeb4e153e5a
parenta3ccf63ee643ef243cbf8918da8b3f9238f10029 (diff)
parent97ad5a034dcc164269d0b8a5cb3e827b33455c11 (diff)
downloadlinux-bd0704111e625ebe75418531550cf471215c3267.tar.gz
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
-rw-r--r--kernel/workqueue.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index ccefe574dcf..47cdd7e76f2 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);