Merge tag 'usb-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[firefly-linux-kernel-4.4.55.git] / include / linux / tty.h

diff --git a/include/linux/tty.h b/include/linux/tty.h
index e53e90ed3f19771ed070679f646cb0e064b40427..90b4fdc8a61f14fcd8753bc5d7d55d89924e9302 100644 (file)
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -39,10 +39,14 @@ struct tty_buffer {
        int size;
        int commit;
        int read;
+       int flags;
        /* Data points here */
        unsigned long data[0];
 };
 
+/* Values for .flags field of tty_buffer */
+#define TTYB_NORMAL    1       /* buffer has no flags buffer */
+
 static inline unsigned char *char_buf_ptr(struct tty_buffer *b, int ofs)
 {
        return ((unsigned char *)b->data) + ofs;
@@ -60,7 +64,8 @@ struct tty_bufhead {
        atomic_t           priority;
        struct tty_buffer sentinel;
        struct llist_head free;         /* Free queue head */
-       atomic_t           memory_used; /* In-use buffers excluding free list */
+       atomic_t           mem_used;    /* In-use buffers excluding free list */
+       int                mem_limit;
        struct tty_buffer *tail;        /* Active buffer */
 };
 /*
@@ -423,7 +428,6 @@ extern int is_ignored(int sig);
 extern int tty_signal(int sig, struct tty_struct *tty);
 extern void tty_hangup(struct tty_struct *tty);
 extern void tty_vhangup(struct tty_struct *tty);
-extern void tty_vhangup_locked(struct tty_struct *tty);
 extern void tty_unhangup(struct file *filp);
 extern int tty_hung_up_p(struct file *filp);
 extern void do_SAK(struct tty_struct *tty);