Move TCSBRKP to compat_ioctl.h

PATCH New Arun Sharma 1 participant 1 message Oct 29, 2004

Subsystems (2)

s390 Generic include/asm header files

lore

Share & tools

lore

Arun Sharma

author

2004-10-29 21:24 UTC #0 lore raw

PATCH 1/1 Move TCSBRKP to compat_ioctl.h

Since TCSBRK is already in compat_ioctl.h, we think TCSBRKP should also be.

-Arun

Move ioctl TCSBRKP support to compat layer. Same rationale as TCSBRK.

- Remove corresponding code under ppc64, sparc64 and s390.
- Use ULONG_IOCTL() instead of COMPATIBLE_IOCTL(), since the argument is int, not pointer.

Signed-off-by Gordon Jin <[email protected]>

Signed-off-by Arun Sharma <[email protected]>

arch/ppc64/kernel/ioctl32.c +0 -1

diff -X dontdiff -purN linux-2.6.8c/arch/ppc64/kernel/ioctl32.c linux-2.6.8-ioctl/arch/ppc64/kernel/ioctl32.c
@@ -41,7 +41,6 @@ IOCTL_TABLE_START
 #include <linux/compat_ioctl.h>
 #define DECLARES
 #include "compat_ioctl.c"
-COMPATIBLE_IOCTL(TCSBRKP)
 COMPATIBLE_IOCTL(TIOCSTART)
 COMPATIBLE_IOCTL(TIOCSTOP)
 COMPATIBLE_IOCTL(TIOCSLTC)

arch/s390/kernel/compat_ioctl.c +0 -3

diff -X dontdiff -purN linux-2.6.8c/arch/s390/kernel/compat_ioctl.c linux-2.6.8-ioctl/arch/s390/kernel/compat_ioctl.c
@@ -65,9 +65,6 @@ COMPATIBLE_IOCTL(BIODASDSATTR)
 COMPATIBLE_IOCTL(TAPE390_DISPLAY)
 #endif
 
-/* This one should be architecture independent */
-COMPATIBLE_IOCTL(TCSBRKP)
-
 /* s390 doesn't need handlers here */
 COMPATIBLE_IOCTL(TIOCGSERIAL)
 COMPATIBLE_IOCTL(TIOCSSERIAL)

arch/sparc64/kernel/ioctl32.c +0 -1

diff -X dontdiff -purN linux-2.6.8c/arch/sparc64/kernel/ioctl32.c linux-2.6.8-ioctl/arch/sparc64/kernel/ioctl32.c
@@ -475,7 +475,6 @@ IOCTL_TABLE_START
 #include <linux/compat_ioctl.h>
 #define DECLARES
 #include "compat_ioctl.c"
-COMPATIBLE_IOCTL(TCSBRKP)
 COMPATIBLE_IOCTL(TIOCSTART)
 COMPATIBLE_IOCTL(TIOCSTOP)
 COMPATIBLE_IOCTL(TIOCSLTC)

include/linux/compat_ioctl.h +1 -0

diff -X dontdiff -purN linux-2.6.8c/include/linux/compat_ioctl.h linux-2.6.8-ioctl/include/linux/compat_ioctl.h
@@ -16,6 +16,7 @@ COMPATIBLE_IOCTL(TCSETA)
 COMPATIBLE_IOCTL(TCSETAW)
 COMPATIBLE_IOCTL(TCSETAF)
 COMPATIBLE_IOCTL(TCSBRK)
+ULONG_IOCTL(TCSBRKP)
 COMPATIBLE_IOCTL(TCXONC)
 COMPATIBLE_IOCTL(TCFLSH)
 COMPATIBLE_IOCTL(TCGETS)