21 files changed, 229 insertions, 1 deletions
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c
index 337c692f6fd..ce3a8bac66f 100644
--- a/drivers/net/wireless/strip.c
+++ b/drivers/net/wireless/strip.c
@@ -798,7 +798,7 @@ static unsigned int get_baud(struct tty_struct *tty)
 */
 static void set_baud(struct tty_struct *tty, unsigned int baudcode)
 {
-        struct termios old_termios = *(tty->termios);
+        struct ktermios old_termios = *(tty->termios);
        tty->termios->c_cflag &= ~CBAUD;        /* Clear the old baud setting */
        tty->termios->c_cflag |= baudcode;      /* Set the new baud setting */
        tty->driver->set_termios(tty, &old_termios);
diff --git a/include/asm-alpha/termbits.h b/include/asm-alpha/termbits.h
index 5541101b58a..ad854a4a3af 100644
--- a/include/asm-alpha/termbits.h
+++ b/include/asm-alpha/termbits.h
@@ -25,6 +25,19 @@ struct termios {
        speed_t c_ospeed;               /* output speed */
 };
+/* Alpha has matching termios and ktermios */
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_cc[NCCS];                /* control characters */
+        cc_t c_line;                    /* line discipline (== c_cc[19]) */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
 /* c_cc characters */
 #define VEOF 0
 #define VEOL 1
diff --git a/include/asm-arm/termbits.h b/include/asm-arm/termbits.h
index bbc6e1d24d3..a3f4fe1742d 100644
--- a/include/asm-arm/termbits.h
+++ b/include/asm-arm/termbits.h
@@ -15,6 +15,18 @@ struct termios {
        cc_t c_cc[NCCS];                /* control characters */
 };
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
 /* c_cc characters */
 #define VINTR 0
 #define VQUIT 1
diff --git a/include/asm-arm26/termbits.h b/include/asm-arm26/termbits.h
index bbc6e1d24d3..a3f4fe1742d 100644
--- a/include/asm-arm26/termbits.h
+++ b/include/asm-arm26/termbits.h
@@ -15,6 +15,18 @@ struct termios {
        cc_t c_cc[NCCS];                /* control characters */
 };
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
 /* c_cc characters */
 #define VINTR 0
 #define VQUIT 1
diff --git a/include/asm-avr32/termbits.h b/include/asm-avr32/termbits.h
index 9dc6eacafa3..c215fafdae4 100644
--- a/include/asm-avr32/termbits.h
+++ b/include/asm-avr32/termbits.h
@@ -17,6 +17,17 @@ struct termios {
        cc_t c_cc[NCCS];                /* control characters */
 };
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
 /* c_cc characters */
 #define VINTR 0
 #define VQUIT 1
diff --git a/include/asm-cris/termbits.h b/include/asm-cris/termbits.h
index be0836d2f28..8d8cec225fe 100644
--- a/include/asm-cris/termbits.h
+++ b/include/asm-cris/termbits.h
@@ -19,6 +19,17 @@ struct termios {
        cc_t c_cc[NCCS];                /* control characters */
 };
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
 /* c_cc characters */
 #define VINTR 0
 #define VQUIT 1
diff --git a/include/asm-frv/termbits.h b/include/asm-frv/termbits.h
index 74f20d6e292..2d6d389cff4 100644
--- a/include/asm-frv/termbits.h
+++ b/include/asm-frv/termbits.h
@@ -17,6 +17,17 @@ struct termios {
        cc_t c_cc[NCCS];                /* control characters */
 };
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
 /* c_cc characters */
 #define VINTR 0
 #define VQUIT 1
diff --git a/include/asm-h8300/termbits.h b/include/asm-h8300/termbits.h
index fa69ae00eda..6a1f4d3807b 100644
--- a/include/asm-h8300/termbits.h
+++ b/include/asm-h8300/termbits.h
@@ -17,6 +17,17 @@ struct termios {
        cc_t c_cc[NCCS];                /* control characters */
 };
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
 /* c_cc characters */
 #define VINTR 0
 #define VQUIT 1
diff --git a/include/asm-i386/termbits.h b/include/asm-i386/termbits.h
index 72c10e3190f..12baf1d6343 100644
--- a/include/asm-i386/termbits.h
+++ b/include/asm-i386/termbits.h
@@ -17,6 +17,17 @@ struct termios {
        cc_t c_cc[NCCS];                /* control characters */
 };
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
 /* c_cc characters */
 #define VINTR 0
 #define VQUIT 1
diff --git a/include/asm-ia64/termbits.h b/include/asm-ia64/termbits.h
index b9e843f7dc4..4531a511bde 100644
--- a/include/asm-ia64/termbits.h
+++ b/include/asm-ia64/termbits.h
@@ -26,6 +26,17 @@ struct termios {
        cc_t c_cc[NCCS];                /* control characters */
 };
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
 /* c_cc characters */
 #define VINTR 0
 #define VQUIT 1
diff --git a/include/asm-m32r/termbits.h b/include/asm-m32r/termbits.h
index 5ace3702df7..faf2bd0504c 100644
--- a/include/asm-m32r/termbits.h
+++ b/include/asm-m32r/termbits.h
@@ -19,6 +19,17 @@ struct termios {
        cc_t c_cc[NCCS];                /* control characters */
 };
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
 /* c_cc characters */
 #define VINTR 0
 #define VQUIT 1
diff --git a/include/asm-m68k/termbits.h b/include/asm-m68k/termbits.h
index e9eec3eb071..a194092240f 100644
--- a/include/asm-m68k/termbits.h
+++ b/include/asm-m68k/termbits.h
@@ -17,6 +17,17 @@ struct termios {
        cc_t c_cc[NCCS];                /* control characters */
 };
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
 /* c_cc characters */
 #define VINTR 0
 #define VQUIT 1
diff --git a/include/asm-mips/termbits.h b/include/asm-mips/termbits.h
index b62ec7c521c..0bbe07b42a0 100644
--- a/include/asm-mips/termbits.h
+++ b/include/asm-mips/termbits.h
@@ -30,6 +30,17 @@ struct termios {
        cc_t c_cc[NCCS];                /* control characters */
 };
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
 /* c_cc characters */
 #define VINTR            0              /* Interrupt character [ISIG].  */
 #define VQUIT            1              /* Quit character [ISIG].  */
diff --git a/include/asm-parisc/termbits.h b/include/asm-parisc/termbits.h
index 372b634892c..a46e299a939 100644
--- a/include/asm-parisc/termbits.h
+++ b/include/asm-parisc/termbits.h
@@ -17,6 +17,17 @@ struct termios {
        cc_t c_cc[NCCS];                /* control characters */
 };
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
 /* c_cc characters */
 #define VINTR 0
 #define VQUIT 1
diff --git a/include/asm-powerpc/termbits.h b/include/asm-powerpc/termbits.h
index 6d533b07aaf..b572f21b32c 100644
--- a/include/asm-powerpc/termbits.h
+++ b/include/asm-powerpc/termbits.h
@@ -30,6 +30,19 @@ struct termios {
        speed_t c_ospeed;               /* output speed */
 };
+/* For PowerPC the termios and ktermios are the same */
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
 /* c_cc characters */
 #define VINTR            0
 #define VQUIT            1
diff --git a/include/asm-s390/termbits.h b/include/asm-s390/termbits.h
index eb3f8bfabf6..585c78a6e40 100644
--- a/include/asm-s390/termbits.h
+++ b/include/asm-s390/termbits.h
@@ -25,6 +25,17 @@ struct termios {
        cc_t c_cc[NCCS];                /* control characters */
 };
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
 /* c_cc characters */
 #define VINTR 0
 #define VQUIT 1
diff --git a/include/asm-sh/termbits.h b/include/asm-sh/termbits.h
index 4f9822a8e7b..f1b7b46f4e9 100644
--- a/include/asm-sh/termbits.h
+++ b/include/asm-sh/termbits.h
@@ -17,6 +17,17 @@ struct termios {
        cc_t c_cc[NCCS];                /* control characters */
 };
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
 /* c_cc characters */
 #define VINTR 0
 #define VQUIT 1
diff --git a/include/asm-sparc/termbits.h b/include/asm-sparc/termbits.h
index 1794d71134b..5eb00a105d7 100644
--- a/include/asm-sparc/termbits.h
+++ b/include/asm-sparc/termbits.h
@@ -31,6 +31,18 @@ struct termios {
 #endif
 };
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        cc_t _x_cc[2];                  /* We need them to hold vmin/vtime */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
 /* c_cc characters */
 #define VINTR    0
 #define VQUIT    1
diff --git a/include/asm-sparc64/termbits.h b/include/asm-sparc64/termbits.h
index b07715273ed..705cd44b417 100644
--- a/include/asm-sparc64/termbits.h
+++ b/include/asm-sparc64/termbits.h
@@ -33,6 +33,18 @@ struct termios {
 #endif
 };
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        cc_t _x_cc[2];                  /* We need them to hold vmin/vtime */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
 /* c_cc characters */
 #define VINTR    0
 #define VQUIT    1
diff --git a/include/asm-v850/termbits.h b/include/asm-v850/termbits.h
index 212d4e27926..f3b43303208 100644
--- a/include/asm-v850/termbits.h
+++ b/include/asm-v850/termbits.h
@@ -17,6 +17,17 @@ struct termios {
        cc_t c_cc[NCCS];                /* control characters */
 };
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
 /* c_cc characters */
 #define VINTR 0
 #define VQUIT 1
diff --git a/include/asm-x86_64/termbits.h b/include/asm-x86_64/termbits.h
index bd950946e52..f31918cea51 100644
--- a/include/asm-x86_64/termbits.h
+++ b/include/asm-x86_64/termbits.h
@@ -17,6 +17,17 @@ struct termios {
        cc_t c_cc[NCCS];                /* control characters */
 };
+struct ktermios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
 /* c_cc characters */
 #define VINTR 0
 #define VQUIT 1

diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c index 337c692f6fd..ce3a8bac66f 100644 --- a/drivers/net/wireless/strip.c +++ b/drivers/net/wireless/strip.c
@@ -798,7 +798,7 @@ static unsigned int get_baud(struct tty_struct *tty)
798	*/	798	*/
799	static void set_baud(struct tty_struct *tty, unsigned int baudcode)	799	static void set_baud(struct tty_struct *tty, unsigned int baudcode)
800	{	800	{
801	struct termios old_termios = *(tty->termios);	801	struct ktermios old_termios = *(tty->termios);
802	tty->termios->c_cflag &= ~CBAUD; /* Clear the old baud setting */	802	tty->termios->c_cflag &= ~CBAUD; /* Clear the old baud setting */
803	tty->termios->c_cflag \|= baudcode; /* Set the new baud setting */	803	tty->termios->c_cflag \|= baudcode; /* Set the new baud setting */
804	tty->driver->set_termios(tty, &old_termios);	804	tty->driver->set_termios(tty, &old_termios);


diff --git a/include/asm-alpha/termbits.h b/include/asm-alpha/termbits.h index 5541101b58a..ad854a4a3af 100644 --- a/include/asm-alpha/termbits.h +++ b/include/asm-alpha/termbits.h
@@ -25,6 +25,19 @@ struct termios {
25	speed_t c_ospeed; /* output speed */	25	speed_t c_ospeed; /* output speed */
26	};	26	};
27		27
		28	/* Alpha has matching termios and ktermios */
		29
		30	struct ktermios {
		31	tcflag_t c_iflag; /* input mode flags */
		32	tcflag_t c_oflag; /* output mode flags */
		33	tcflag_t c_cflag; /* control mode flags */
		34	tcflag_t c_lflag; /* local mode flags */
		35	cc_t c_cc[NCCS]; /* control characters */
		36	cc_t c_line; /* line discipline (== c_cc[19]) */
		37	speed_t c_ispeed; /* input speed */
		38	speed_t c_ospeed; /* output speed */
		39	};
		40
28	/* c_cc characters */	41	/* c_cc characters */
29	#define VEOF 0	42	#define VEOF 0
30	#define VEOL 1	43	#define VEOL 1


diff --git a/include/asm-arm/termbits.h b/include/asm-arm/termbits.h index bbc6e1d24d3..a3f4fe1742d 100644 --- a/include/asm-arm/termbits.h +++ b/include/asm-arm/termbits.h
@@ -15,6 +15,18 @@ struct termios {
15	cc_t c_cc[NCCS]; /* control characters */	15	cc_t c_cc[NCCS]; /* control characters */
16	};	16	};
17		17
		18	struct ktermios {
		19	tcflag_t c_iflag; /* input mode flags */
		20	tcflag_t c_oflag; /* output mode flags */
		21	tcflag_t c_cflag; /* control mode flags */
		22	tcflag_t c_lflag; /* local mode flags */
		23	cc_t c_line; /* line discipline */
		24	cc_t c_cc[NCCS]; /* control characters */
		25	speed_t c_ispeed; /* input speed */
		26	speed_t c_ospeed; /* output speed */
		27	};
		28
		29
18	/* c_cc characters */	30	/* c_cc characters */
19	#define VINTR 0	31	#define VINTR 0
20	#define VQUIT 1	32	#define VQUIT 1


diff --git a/include/asm-arm26/termbits.h b/include/asm-arm26/termbits.h index bbc6e1d24d3..a3f4fe1742d 100644 --- a/include/asm-arm26/termbits.h +++ b/include/asm-arm26/termbits.h
@@ -15,6 +15,18 @@ struct termios {
15	cc_t c_cc[NCCS]; /* control characters */	15	cc_t c_cc[NCCS]; /* control characters */
16	};	16	};
17		17
		18	struct ktermios {
		19	tcflag_t c_iflag; /* input mode flags */
		20	tcflag_t c_oflag; /* output mode flags */
		21	tcflag_t c_cflag; /* control mode flags */
		22	tcflag_t c_lflag; /* local mode flags */
		23	cc_t c_line; /* line discipline */
		24	cc_t c_cc[NCCS]; /* control characters */
		25	speed_t c_ispeed; /* input speed */
		26	speed_t c_ospeed; /* output speed */
		27	};
		28
		29
18	/* c_cc characters */	30	/* c_cc characters */
19	#define VINTR 0	31	#define VINTR 0
20	#define VQUIT 1	32	#define VQUIT 1


diff --git a/include/asm-avr32/termbits.h b/include/asm-avr32/termbits.h index 9dc6eacafa3..c215fafdae4 100644 --- a/include/asm-avr32/termbits.h +++ b/include/asm-avr32/termbits.h
@@ -17,6 +17,17 @@ struct termios {
17	cc_t c_cc[NCCS]; /* control characters */	17	cc_t c_cc[NCCS]; /* control characters */
18	};	18	};
19		19
		20	struct ktermios {
		21	tcflag_t c_iflag; /* input mode flags */
		22	tcflag_t c_oflag; /* output mode flags */
		23	tcflag_t c_cflag; /* control mode flags */
		24	tcflag_t c_lflag; /* local mode flags */
		25	cc_t c_line; /* line discipline */
		26	cc_t c_cc[NCCS]; /* control characters */
		27	speed_t c_ispeed; /* input speed */
		28	speed_t c_ospeed; /* output speed */
		29	};
		30
20	/* c_cc characters */	31	/* c_cc characters */
21	#define VINTR 0	32	#define VINTR 0
22	#define VQUIT 1	33	#define VQUIT 1


diff --git a/include/asm-cris/termbits.h b/include/asm-cris/termbits.h index be0836d2f28..8d8cec225fe 100644 --- a/include/asm-cris/termbits.h +++ b/include/asm-cris/termbits.h
@@ -19,6 +19,17 @@ struct termios {
19	cc_t c_cc[NCCS]; /* control characters */	19	cc_t c_cc[NCCS]; /* control characters */
20	};	20	};
21		21
		22	struct ktermios {
		23	tcflag_t c_iflag; /* input mode flags */
		24	tcflag_t c_oflag; /* output mode flags */
		25	tcflag_t c_cflag; /* control mode flags */
		26	tcflag_t c_lflag; /* local mode flags */
		27	cc_t c_line; /* line discipline */
		28	cc_t c_cc[NCCS]; /* control characters */
		29	speed_t c_ispeed; /* input speed */
		30	speed_t c_ospeed; /* output speed */
		31	};
		32
22	/* c_cc characters */	33	/* c_cc characters */
23	#define VINTR 0	34	#define VINTR 0
24	#define VQUIT 1	35	#define VQUIT 1


diff --git a/include/asm-frv/termbits.h b/include/asm-frv/termbits.h index 74f20d6e292..2d6d389cff4 100644 --- a/include/asm-frv/termbits.h +++ b/include/asm-frv/termbits.h
@@ -17,6 +17,17 @@ struct termios {
17	cc_t c_cc[NCCS]; /* control characters */	17	cc_t c_cc[NCCS]; /* control characters */
18	};	18	};
19		19
		20	struct ktermios {
		21	tcflag_t c_iflag; /* input mode flags */
		22	tcflag_t c_oflag; /* output mode flags */
		23	tcflag_t c_cflag; /* control mode flags */
		24	tcflag_t c_lflag; /* local mode flags */
		25	cc_t c_line; /* line discipline */
		26	cc_t c_cc[NCCS]; /* control characters */
		27	speed_t c_ispeed; /* input speed */
		28	speed_t c_ospeed; /* output speed */
		29	};
		30
20	/* c_cc characters */	31	/* c_cc characters */
21	#define VINTR 0	32	#define VINTR 0
22	#define VQUIT 1	33	#define VQUIT 1


diff --git a/include/asm-h8300/termbits.h b/include/asm-h8300/termbits.h index fa69ae00eda..6a1f4d3807b 100644 --- a/include/asm-h8300/termbits.h +++ b/include/asm-h8300/termbits.h
@@ -17,6 +17,17 @@ struct termios {
17	cc_t c_cc[NCCS]; /* control characters */	17	cc_t c_cc[NCCS]; /* control characters */
18	};	18	};
19		19
		20	struct ktermios {
		21	tcflag_t c_iflag; /* input mode flags */
		22	tcflag_t c_oflag; /* output mode flags */
		23	tcflag_t c_cflag; /* control mode flags */
		24	tcflag_t c_lflag; /* local mode flags */
		25	cc_t c_line; /* line discipline */
		26	cc_t c_cc[NCCS]; /* control characters */
		27	speed_t c_ispeed; /* input speed */
		28	speed_t c_ospeed; /* output speed */
		29	};
		30
20	/* c_cc characters */	31	/* c_cc characters */
21	#define VINTR 0	32	#define VINTR 0
22	#define VQUIT 1	33	#define VQUIT 1


diff --git a/include/asm-i386/termbits.h b/include/asm-i386/termbits.h index 72c10e3190f..12baf1d6343 100644 --- a/include/asm-i386/termbits.h +++ b/include/asm-i386/termbits.h
@@ -17,6 +17,17 @@ struct termios {
17	cc_t c_cc[NCCS]; /* control characters */	17	cc_t c_cc[NCCS]; /* control characters */
18	};	18	};
19		19
		20	struct ktermios {
		21	tcflag_t c_iflag; /* input mode flags */
		22	tcflag_t c_oflag; /* output mode flags */
		23	tcflag_t c_cflag; /* control mode flags */
		24	tcflag_t c_lflag; /* local mode flags */
		25	cc_t c_line; /* line discipline */
		26	cc_t c_cc[NCCS]; /* control characters */
		27	speed_t c_ispeed; /* input speed */
		28	speed_t c_ospeed; /* output speed */
		29	};
		30
20	/* c_cc characters */	31	/* c_cc characters */
21	#define VINTR 0	32	#define VINTR 0
22	#define VQUIT 1	33	#define VQUIT 1


diff --git a/include/asm-ia64/termbits.h b/include/asm-ia64/termbits.h index b9e843f7dc4..4531a511bde 100644 --- a/include/asm-ia64/termbits.h +++ b/include/asm-ia64/termbits.h
@@ -26,6 +26,17 @@ struct termios {
26	cc_t c_cc[NCCS]; /* control characters */	26	cc_t c_cc[NCCS]; /* control characters */
27	};	27	};
28		28
		29	struct ktermios {
		30	tcflag_t c_iflag; /* input mode flags */
		31	tcflag_t c_oflag; /* output mode flags */
		32	tcflag_t c_cflag; /* control mode flags */
		33	tcflag_t c_lflag; /* local mode flags */
		34	cc_t c_line; /* line discipline */
		35	cc_t c_cc[NCCS]; /* control characters */
		36	speed_t c_ispeed; /* input speed */
		37	speed_t c_ospeed; /* output speed */
		38	};
		39
29	/* c_cc characters */	40	/* c_cc characters */
30	#define VINTR 0	41	#define VINTR 0
31	#define VQUIT 1	42	#define VQUIT 1


diff --git a/include/asm-m32r/termbits.h b/include/asm-m32r/termbits.h index 5ace3702df7..faf2bd0504c 100644 --- a/include/asm-m32r/termbits.h +++ b/include/asm-m32r/termbits.h
@@ -19,6 +19,17 @@ struct termios {
19	cc_t c_cc[NCCS]; /* control characters */	19	cc_t c_cc[NCCS]; /* control characters */
20	};	20	};
21		21
		22	struct ktermios {
		23	tcflag_t c_iflag; /* input mode flags */
		24	tcflag_t c_oflag; /* output mode flags */
		25	tcflag_t c_cflag; /* control mode flags */
		26	tcflag_t c_lflag; /* local mode flags */
		27	cc_t c_line; /* line discipline */
		28	cc_t c_cc[NCCS]; /* control characters */
		29	speed_t c_ispeed; /* input speed */
		30	speed_t c_ospeed; /* output speed */
		31	};
		32
22	/* c_cc characters */	33	/* c_cc characters */
23	#define VINTR 0	34	#define VINTR 0
24	#define VQUIT 1	35	#define VQUIT 1


diff --git a/include/asm-m68k/termbits.h b/include/asm-m68k/termbits.h index e9eec3eb071..a194092240f 100644 --- a/include/asm-m68k/termbits.h +++ b/include/asm-m68k/termbits.h
@@ -17,6 +17,17 @@ struct termios {
17	cc_t c_cc[NCCS]; /* control characters */	17	cc_t c_cc[NCCS]; /* control characters */
18	};	18	};
19		19
		20	struct ktermios {
		21	tcflag_t c_iflag; /* input mode flags */
		22	tcflag_t c_oflag; /* output mode flags */
		23	tcflag_t c_cflag; /* control mode flags */
		24	tcflag_t c_lflag; /* local mode flags */
		25	cc_t c_line; /* line discipline */
		26	cc_t c_cc[NCCS]; /* control characters */
		27	speed_t c_ispeed; /* input speed */
		28	speed_t c_ospeed; /* output speed */
		29	};
		30
20	/* c_cc characters */	31	/* c_cc characters */
21	#define VINTR 0	32	#define VINTR 0
22	#define VQUIT 1	33	#define VQUIT 1


diff --git a/include/asm-mips/termbits.h b/include/asm-mips/termbits.h index b62ec7c521c..0bbe07b42a0 100644 --- a/include/asm-mips/termbits.h +++ b/include/asm-mips/termbits.h
@@ -30,6 +30,17 @@ struct termios {
30	cc_t c_cc[NCCS]; /* control characters */	30	cc_t c_cc[NCCS]; /* control characters */
31	};	31	};
32		32
		33	struct ktermios {
		34	tcflag_t c_iflag; /* input mode flags */
		35	tcflag_t c_oflag; /* output mode flags */
		36	tcflag_t c_cflag; /* control mode flags */
		37	tcflag_t c_lflag; /* local mode flags */
		38	cc_t c_line; /* line discipline */
		39	cc_t c_cc[NCCS]; /* control characters */
		40	speed_t c_ispeed; /* input speed */
		41	speed_t c_ospeed; /* output speed */
		42	};
		43
33	/* c_cc characters */	44	/* c_cc characters */
34	#define VINTR 0 /* Interrupt character [ISIG]. */	45	#define VINTR 0 /* Interrupt character [ISIG]. */
35	#define VQUIT 1 /* Quit character [ISIG]. */	46	#define VQUIT 1 /* Quit character [ISIG]. */


diff --git a/include/asm-parisc/termbits.h b/include/asm-parisc/termbits.h index 372b634892c..a46e299a939 100644 --- a/include/asm-parisc/termbits.h +++ b/include/asm-parisc/termbits.h
@@ -17,6 +17,17 @@ struct termios {
17	cc_t c_cc[NCCS]; /* control characters */	17	cc_t c_cc[NCCS]; /* control characters */
18	};	18	};
19		19
		20	struct ktermios {
		21	tcflag_t c_iflag; /* input mode flags */
		22	tcflag_t c_oflag; /* output mode flags */
		23	tcflag_t c_cflag; /* control mode flags */
		24	tcflag_t c_lflag; /* local mode flags */
		25	cc_t c_line; /* line discipline */
		26	cc_t c_cc[NCCS]; /* control characters */
		27	speed_t c_ispeed; /* input speed */
		28	speed_t c_ospeed; /* output speed */
		29	};
		30
20	/* c_cc characters */	31	/* c_cc characters */
21	#define VINTR 0	32	#define VINTR 0
22	#define VQUIT 1	33	#define VQUIT 1


diff --git a/include/asm-powerpc/termbits.h b/include/asm-powerpc/termbits.h index 6d533b07aaf..b572f21b32c 100644 --- a/include/asm-powerpc/termbits.h +++ b/include/asm-powerpc/termbits.h
@@ -30,6 +30,19 @@ struct termios {
30	speed_t c_ospeed; /* output speed */	30	speed_t c_ospeed; /* output speed */
31	};	31	};
32		32
		33	/* For PowerPC the termios and ktermios are the same */
		34
		35	struct ktermios {
		36	tcflag_t c_iflag; /* input mode flags */
		37	tcflag_t c_oflag; /* output mode flags */
		38	tcflag_t c_cflag; /* control mode flags */
		39	tcflag_t c_lflag; /* local mode flags */
		40	cc_t c_line; /* line discipline */
		41	cc_t c_cc[NCCS]; /* control characters */
		42	speed_t c_ispeed; /* input speed */
		43	speed_t c_ospeed; /* output speed */
		44	};
		45
33	/* c_cc characters */	46	/* c_cc characters */
34	#define VINTR 0	47	#define VINTR 0
35	#define VQUIT 1	48	#define VQUIT 1


diff --git a/include/asm-s390/termbits.h b/include/asm-s390/termbits.h index eb3f8bfabf6..585c78a6e40 100644 --- a/include/asm-s390/termbits.h +++ b/include/asm-s390/termbits.h
@@ -25,6 +25,17 @@ struct termios {
25	cc_t c_cc[NCCS]; /* control characters */	25	cc_t c_cc[NCCS]; /* control characters */
26	};	26	};
27		27
		28	struct ktermios {
		29	tcflag_t c_iflag; /* input mode flags */
		30	tcflag_t c_oflag; /* output mode flags */
		31	tcflag_t c_cflag; /* control mode flags */
		32	tcflag_t c_lflag; /* local mode flags */
		33	cc_t c_line; /* line discipline */
		34	cc_t c_cc[NCCS]; /* control characters */
		35	speed_t c_ispeed; /* input speed */
		36	speed_t c_ospeed; /* output speed */
		37	};
		38
28	/* c_cc characters */	39	/* c_cc characters */
29	#define VINTR 0	40	#define VINTR 0
30	#define VQUIT 1	41	#define VQUIT 1


diff --git a/include/asm-sh/termbits.h b/include/asm-sh/termbits.h index 4f9822a8e7b..f1b7b46f4e9 100644 --- a/include/asm-sh/termbits.h +++ b/include/asm-sh/termbits.h
@@ -17,6 +17,17 @@ struct termios {
17	cc_t c_cc[NCCS]; /* control characters */	17	cc_t c_cc[NCCS]; /* control characters */
18	};	18	};
19		19
		20	struct ktermios {
		21	tcflag_t c_iflag; /* input mode flags */
		22	tcflag_t c_oflag; /* output mode flags */
		23	tcflag_t c_cflag; /* control mode flags */
		24	tcflag_t c_lflag; /* local mode flags */
		25	cc_t c_line; /* line discipline */
		26	cc_t c_cc[NCCS]; /* control characters */
		27	speed_t c_ispeed; /* input speed */
		28	speed_t c_ospeed; /* output speed */
		29	};
		30
20	/* c_cc characters */	31	/* c_cc characters */
21	#define VINTR 0	32	#define VINTR 0
22	#define VQUIT 1	33	#define VQUIT 1


diff --git a/include/asm-sparc/termbits.h b/include/asm-sparc/termbits.h index 1794d71134b..5eb00a105d7 100644 --- a/include/asm-sparc/termbits.h +++ b/include/asm-sparc/termbits.h
@@ -31,6 +31,18 @@ struct termios {
31	#endif	31	#endif
32	};	32	};
33		33
		34	struct ktermios {
		35	tcflag_t c_iflag; /* input mode flags */
		36	tcflag_t c_oflag; /* output mode flags */
		37	tcflag_t c_cflag; /* control mode flags */
		38	tcflag_t c_lflag; /* local mode flags */
		39	cc_t c_line; /* line discipline */
		40	cc_t c_cc[NCCS]; /* control characters */
		41	cc_t _x_cc[2]; /* We need them to hold vmin/vtime */
		42	speed_t c_ispeed; /* input speed */
		43	speed_t c_ospeed; /* output speed */
		44	};
		45
34	/* c_cc characters */	46	/* c_cc characters */
35	#define VINTR 0	47	#define VINTR 0
36	#define VQUIT 1	48	#define VQUIT 1


diff --git a/include/asm-sparc64/termbits.h b/include/asm-sparc64/termbits.h index b07715273ed..705cd44b417 100644 --- a/include/asm-sparc64/termbits.h +++ b/include/asm-sparc64/termbits.h
@@ -33,6 +33,18 @@ struct termios {
33	#endif	33	#endif
34	};	34	};
35		35
		36	struct ktermios {
		37	tcflag_t c_iflag; /* input mode flags */
		38	tcflag_t c_oflag; /* output mode flags */
		39	tcflag_t c_cflag; /* control mode flags */
		40	tcflag_t c_lflag; /* local mode flags */
		41	cc_t c_line; /* line discipline */
		42	cc_t c_cc[NCCS]; /* control characters */
		43	cc_t _x_cc[2]; /* We need them to hold vmin/vtime */
		44	speed_t c_ispeed; /* input speed */
		45	speed_t c_ospeed; /* output speed */
		46	};
		47
36	/* c_cc characters */	48	/* c_cc characters */
37	#define VINTR 0	49	#define VINTR 0
38	#define VQUIT 1	50	#define VQUIT 1


diff --git a/include/asm-v850/termbits.h b/include/asm-v850/termbits.h index 212d4e27926..f3b43303208 100644 --- a/include/asm-v850/termbits.h +++ b/include/asm-v850/termbits.h
@@ -17,6 +17,17 @@ struct termios {
17	cc_t c_cc[NCCS]; /* control characters */	17	cc_t c_cc[NCCS]; /* control characters */
18	};	18	};
19		19
		20	struct ktermios {
		21	tcflag_t c_iflag; /* input mode flags */
		22	tcflag_t c_oflag; /* output mode flags */
		23	tcflag_t c_cflag; /* control mode flags */
		24	tcflag_t c_lflag; /* local mode flags */
		25	cc_t c_line; /* line discipline */
		26	cc_t c_cc[NCCS]; /* control characters */
		27	speed_t c_ispeed; /* input speed */
		28	speed_t c_ospeed; /* output speed */
		29	};
		30
20	/* c_cc characters */	31	/* c_cc characters */
21	#define VINTR 0	32	#define VINTR 0
22	#define VQUIT 1	33	#define VQUIT 1


diff --git a/include/asm-x86_64/termbits.h b/include/asm-x86_64/termbits.h index bd950946e52..f31918cea51 100644 --- a/include/asm-x86_64/termbits.h +++ b/include/asm-x86_64/termbits.h
@@ -17,6 +17,17 @@ struct termios {
17	cc_t c_cc[NCCS]; /* control characters */	17	cc_t c_cc[NCCS]; /* control characters */
18	};	18	};
19		19
		20	struct ktermios {
		21	tcflag_t c_iflag; /* input mode flags */
		22	tcflag_t c_oflag; /* output mode flags */
		23	tcflag_t c_cflag; /* control mode flags */
		24	tcflag_t c_lflag; /* local mode flags */
		25	cc_t c_line; /* line discipline */
		26	cc_t c_cc[NCCS]; /* control characters */
		27	speed_t c_ispeed; /* input speed */
		28	speed_t c_ospeed; /* output speed */
		29	};
		30
20	/* c_cc characters */	31	/* c_cc characters */
21	#define VINTR 0	32	#define VINTR 0
22	#define VQUIT 1	33	#define VQUIT 1