Merge branch 'linus' into tracing/core

Conflicts:
	kernel/trace/trace_events_filter.c

We use the tracing/core version.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 13 insertions, 0 deletions

diff --git a/drivers/char/tty_buffer.c b/drivers/char/tty_buffer.c
index 810ee25d66a4..3108991c5c8b 100644
--- a/drivers/char/tty_buffer.c
+++ b/drivers/char/tty_buffer.c
@@ -462,6 +462,19 @@ static void flush_to_ldisc(struct work_struct *work)
 }
 
 /**
+ *      tty_flush_to_ldisc
+ *      @tty: tty to push
+ *
+ *      Push the terminal flip buffers to the line discipline.
+ *
+ *      Must not be called from IRQ context.
+ */
+void tty_flush_to_ldisc(struct tty_struct *tty)
+{
+        flush_to_ldisc(&tty->buf.work.work);
+}
+
+/**
  *      tty_flip_buffer_push    -       terminal
  *      @tty: tty to push
  *