1 files changed, 2 insertions, 16 deletions

diff --git a/include/linux/tty.h b/include/linux/tty.h
index cb35ca50a0a..ea4c2605f8d 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -5,16 +5,6 @@
  * 'tty.h' defines some structures used by tty_io.c and some defines.
  */
 
-/*
- * These constants are also useful for user-level apps (e.g., VC
- * resizing).
- */
-#define MIN_NR_CONSOLES 1       /* must be at least 1 */
-#define MAX_NR_CONSOLES 63      /* serial lines start at 64 */
-#define MAX_NR_USER_CONSOLES 63 /* must be root to allocate above this */
-                /* Note: the ioctl VT_GETSTATE does not work for
-                   consoles 16 and higher (since it returns a short) */
-
 #ifdef __KERNEL__
 #include <linux/fs.h>
 #include <linux/major.h>
@@ -22,7 +12,6 @@
 #include <linux/workqueue.h>
 #include <linux/tty_driver.h>
 #include <linux/tty_ldisc.h>
-#include <linux/screen_info.h>
 #include <linux/mutex.h>
 
 #include <asm/system.h>
@@ -57,7 +46,6 @@ struct tty_buffer {
         unsigned char *flag_buf_ptr;
         int used;
         int size;
-        int active;
         int commit;
         int read;
         /* Data points here */
@@ -71,6 +59,7 @@ struct tty_bufhead {
         struct tty_buffer *head;        /* Queue head */
         struct tty_buffer *tail;        /* Active buffer */
         struct tty_buffer *free;        /* Free queue head */
+        int memory_used;                /* Buffer space used excluding free queue */
 };
 /*
  * The pty uses char_buf and flag_buf as a contiguous buffer
@@ -185,7 +174,7 @@ struct tty_struct {
         struct tty_driver *driver;
         int index;
         struct tty_ldisc ldisc;
-        struct semaphore termios_sem;
+        struct mutex termios_mutex;
         struct termios *termios, *termios_locked;
         char name[64];
         int pgrp;
@@ -201,7 +190,6 @@ struct tty_struct {
         struct tty_struct *link;
         struct fasync_struct *fasync;
         struct tty_bufhead buf;
-        int max_flip_cnt;
         int alt_speed;          /* For magic substitution of 38400 bps */
         wait_queue_head_t write_wait;
         wait_queue_head_t read_wait;
@@ -259,7 +247,6 @@ struct tty_struct {
 #define TTY_DO_WRITE_WAKEUP     5       /* Call write_wakeup after queuing new */
 #define TTY_PUSH                6       /* n_tty private */
 #define TTY_CLOSING             7       /* ->close() in progress */
-#define TTY_DONT_FLIP           8       /* Defer buffer flip */
 #define TTY_LDISC               9       /* Line discipline attached */
 #define TTY_HW_COOK_OUT         14      /* Hardware can do output cooking */
 #define TTY_HW_COOK_IN          15      /* Hardware can do input cooking */
@@ -272,7 +259,6 @@ struct tty_struct {
 extern void tty_write_flush(struct tty_struct *);
 
 extern struct termios tty_std_termios;
-extern int fg_console, last_console, want_console;
 
 extern int kmsg_redirect;