From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 14 Oct 2009 16:20:41 +0000 (-0700)
Subject: tty: use the new 'flush_delayed_work()' helper to do ldisc flush
X-Git-Tag: v2.6.32-rc5~16^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=514fc01d389cf5d364ee3b5fec4ac1487448803e;p=~emulex%2Finfiniband.git

tty: use the new 'flush_delayed_work()' helper to do ldisc flush

This way all flush_to_ldisc work is always done through the workqueues,
and we thus have a single point of serialization.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/char/tty_buffer.c b/drivers/char/tty_buffer.c
index 0296612cc7d..66fa4e10d76 100644
--- a/drivers/char/tty_buffer.c
+++ b/drivers/char/tty_buffer.c
@@ -468,7 +468,7 @@ static void flush_to_ldisc(struct work_struct *work)
  */
 void tty_flush_to_ldisc(struct tty_struct *tty)
 {
-	flush_to_ldisc(&tty->buf.work.work);
+	flush_delayed_work(&tty->buf.work);
 }
 
 /**