Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge the right tty-fixes branch

Browse source 
* 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
This commit is contained in:
Linus Torvalds 2009-10-15 14:59:24 -07:00
commit bd0704111e
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kernel/workqueue.c
View file

@ -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);