From 8d8adf27837cb1a88b7db4e19153ae77dde3dd86 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Fri, 8 Feb 2008 04:18:40 -0800
Subject: [PATCH] --- yaml --- r: 84623 b: refs/heads/master c:
 596f56018df3ed7de20f6038f72177b3674ebbd4 h: refs/heads/master i:   84621:
 da73a5f972ec61f9267e0755fcbc3a9e8c419ede   84619:
 693a59491d35aceca7f19fff58063dbad9c9ac18   84615:
 fade416e8500252a5bdcc34af623d3a1e7ab3549   84607:
 824f890c7cb8b180c0fc7269d4dd9a86200ea797 v: v3

---
 [refs]                            | 2 +-
 trunk/include/asm-s390/ioctls.h   | 4 ++++
 trunk/include/asm-s390/termbits.h | 5 ++++-
 trunk/include/asm-s390/termios.h  | 3 +++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c556c96245bd..abe6044ad9ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa7738a5f503abea5445cdd8cc2d501502c748ae
+refs/heads/master: 596f56018df3ed7de20f6038f72177b3674ebbd4
diff --git a/trunk/include/asm-s390/ioctls.h b/trunk/include/asm-s390/ioctls.h
index 07e19b2dd73f..40e481b1b461 100644
--- a/trunk/include/asm-s390/ioctls.h
+++ b/trunk/include/asm-s390/ioctls.h
@@ -54,6 +54,10 @@
 #define TIOCSBRK	0x5427  /* BSD compatibility */
 #define TIOCCBRK	0x5428  /* BSD compatibility */
 #define TIOCGSID	0x5429  /* Return the session ID of FD */
+#define TCGETS2		_IOR('T',0x2A, struct termios2)
+#define TCSETS2		_IOW('T',0x2B, struct termios2)
+#define TCSETSW2	_IOW('T',0x2C, struct termios2)
+#define TCSETSF2	_IOW('T',0x2D, struct termios2)
 #define TIOCGPTN	_IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
 #define TIOCSPTLCK	_IOW('T',0x31, int)  /* Lock/unlock Pty */
 
diff --git a/trunk/include/asm-s390/termbits.h b/trunk/include/asm-s390/termbits.h
index 811b9a9cdc08..58731853d529 100644
--- a/trunk/include/asm-s390/termbits.h
+++ b/trunk/include/asm-s390/termbits.h
@@ -148,6 +148,7 @@ struct ktermios {
 #define HUPCL	0002000
 #define CLOCAL	0004000
 #define CBAUDEX 0010000
+#define  BOTHER  0010000
 #define  B57600  0010001
 #define  B115200 0010002
 #define  B230400 0010003
@@ -163,10 +164,12 @@ struct ktermios {
 #define  B3000000 0010015
 #define  B3500000 0010016
 #define  B4000000 0010017
-#define CIBAUD	  002003600000	/* input baud rate (not used) */
+#define CIBAUD	  002003600000	/* input baud rate */
 #define CMSPAR	  010000000000		/* mark or space (stick) parity */
 #define CRTSCTS	  020000000000		/* flow control */
 
+#define IBSHIFT	  16		/* Shift from CBAUD to CIBAUD */
+
 /* c_lflag bits */
 #define ISIG	0000001
 #define ICANON	0000002
diff --git a/trunk/include/asm-s390/termios.h b/trunk/include/asm-s390/termios.h
index a3480e25eb4b..67f66278f533 100644
--- a/trunk/include/asm-s390/termios.h
+++ b/trunk/include/asm-s390/termios.h
@@ -57,6 +57,9 @@ struct termio {
 */
 #define INIT_C_CC "\003\034\177\025\004\0\1\0\021\023\032\0\022\017\027\026\0"
 
+#define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios2))
+#define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios2))
+
 #include <asm-generic/termios.h>
 
 #endif	/* __KERNEL__ */