tty: Use non-atomic state to signal flip buffer flush pending

Atomic bit ops are no longer required to indicate a flip buffer
flush is pending, as the flush_mutex is sufficient barrier.

Remove the unnecessary port .iflags field and localize flip buffer
state to struct tty_bufhead.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 1 insertions, 2 deletions

diff --git a/include/linux/tty.h b/include/linux/tty.h
index b8e8adf95bf3..991575fe3451 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -68,6 +68,7 @@ struct tty_bufhead {
         struct tty_buffer *head;        /* Queue head */
         struct work_struct work;
         struct mutex flush_mutex;
+        unsigned int flushpending:1;
         struct tty_buffer sentinel;
         struct llist_head free;         /* Free queue head */
         atomic_t           memory_used; /* In-use buffers excluding free list */
@@ -212,8 +213,6 @@ struct tty_port {
         wait_queue_head_t       close_wait;     /* Close waiters */
         wait_queue_head_t       delta_msr_wait; /* Modem status change */
         unsigned long           flags;          /* TTY flags ASY_*/
-        unsigned long           iflags;         /* TTYP_ internal flags */
-#define TTYP_FLUSHPENDING               2  /* Queued buffer flush pending */
         unsigned char           console:1,      /* port is a console */
                                 low_latency:1;  /* direct buffer flush */
         struct mutex            mutex;          /* Locking */