Commit bd070411 authored by Linus Torvalds's avatar Linus Torvalds

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
parents a3ccf63e 97ad5a03
...@@ -647,7 +647,7 @@ EXPORT_SYMBOL(schedule_delayed_work); ...@@ -647,7 +647,7 @@ EXPORT_SYMBOL(schedule_delayed_work);
*/ */
void flush_delayed_work(struct delayed_work *dwork) void flush_delayed_work(struct delayed_work *dwork)
{ {
if (del_timer(&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(keventd_wq, get_cpu());
__queue_work(cwq, &dwork->work); __queue_work(cwq, &dwork->work);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment