Skip to contentSkip to conversation

tty: Add the new termios2 ioctls to the compatible list.

PATCH In review Heiko Carstens 3 participants 4 messages Nov 19, 2007 – Nov 20, 2007 VFS

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 tty: Add the new termios2 ioctls to the compatible list.

From: Heiko Carstens <[email protected]>

Make them depend on TCGETS2. If that one is implemented the rest should be there as well.

---

 fs/compat_ioctl.c |    6 ++++++
 1 file changed, 6 insertions(+)
fs/compat_ioctl.c +6 -0
Index: linux-2.6/fs/compat_ioctl.c
===================================================================
@@ -1954,6 +1954,12 @@ ULONG_IOCTL(TIOCSCTTY)
 COMPATIBLE_IOCTL(TIOCGPTN)
 COMPATIBLE_IOCTL(TIOCSPTLCK)
 COMPATIBLE_IOCTL(TIOCSERGETLSR)
+#ifdef TCGETS2
+COMPATIBLE_IOCTL(TCGETS2)
+COMPATIBLE_IOCTL(TCSETS2)
+COMPATIBLE_IOCTL(TCSETSW2)
+COMPATIBLE_IOCTL(TCSETSF2)
+#endif
 /* Little f */
 COMPATIBLE_IOCTL(FIOCLEX)
 COMPATIBLE_IOCTL(FIONCLEX)
#2 lore raw
In reply to Heiko Carstens
Quoted 19 lines · On Mon, 19 Nov 2007 13:52:06 +0100 Heiko Carstens <[email protected]>…

From: Heiko Carstens <[email protected]>

Make them depend on TCGETS2. If that one is implemented the rest should be there as well.

---

 fs/compat_ioctl.c |    6 ++++++
 1 file changed, 6 insertions(+)

Index: linux-2.6/fs/compat_ioctl.c
===================================================================

fs/compat_ioctl.c +0 -0
@@ -1954,6 +1954,12 @@ ULONG_IOCTL(TIOCSCTTY)
 COMPATIBLE_IOCTL(TIOCGPTN)
 COMPATIBLE_IOCTL(TIOCSPTLCK)

fs/compat_ioctl.c ULONG_IOCTL(TIOCSCTTY) · line 1965

Quoted 10 lines
fs/compat_ioctl.c +6 -0
 COMPATIBLE_IOCTL(TIOCSERGETLSR)
+#ifdef TCGETS2
+COMPATIBLE_IOCTL(TCGETS2)
+COMPATIBLE_IOCTL(TCSETS2)
+COMPATIBLE_IOCTL(TCSETSW2)
+COMPATIBLE_IOCTL(TCSETSF2)
+#endif
 /* Little f */
 COMPATIBLE_IOCTL(FIOCLEX)
 COMPATIBLE_IOCTL(FIONCLEX)

Should this be in 2.6.24?

#3 lore raw
Quoted 12 lines · Andrew Morton
Quoted 11 lines · On Mon, 19 Nov 2007 13:52:06 +0100 Heiko Carstens <[email protected]>…

Index: linux-2.6/fs/compat_ioctl.c
===================================================================

fs/compat_ioctl.c +3 -0
@@ -1954,6 +1954,12 @@ ULONG_IOCTL(TIOCSCTTY)
 COMPATIBLE_IOCTL(TIOCGPTN)
 COMPATIBLE_IOCTL(TIOCSPTLCK)
 COMPATIBLE_IOCTL(TIOCSERGETLSR)
+#ifdef TCGETS2
+COMPATIBLE_IOCTL(TCGETS2)
+COMPATIBLE_IOCTL(TCSETS2)
Quoted 8 lines

fs/compat_ioctl.c ULONG_IOCTL(TIOCSCTTY) · line 1965

Quoted 6 lines
fs/compat_ioctl.c +3 -0
+COMPATIBLE_IOCTL(TCSETSW2)
+COMPATIBLE_IOCTL(TCSETSF2)
+#endif
 /* Little f */
 COMPATIBLE_IOCTL(FIOCLEX)
 COMPATIBLE_IOCTL(FIONCLEX)

Should this be in 2.6.24?

Can't hurt. At least it passed Alan's test suite on s390 (32 bit, 64 bit and compat mode).