From: Christoph Hellwig TIOCSTART and TIOCSTOP are defined in asm/ioctls.h and asm/termios.h by various architectures but not actually implemented anywhere but in the IRIX compatibility layer, so remove their COMPATIBLE_IOCTL from parisc, ppc64 and sparc64. Move the TIOCSLTC COMPATIBLE_IOCTL to common code, guided by an ifdef to only show up on architectures that support it (same as the code handling it in tty_ioctl.c), aswell as it's brother TIOCGLTC that wasn't handled so far. Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton --- arch/parisc/kernel/ioctl32.c | 5 ----- arch/ppc64/kernel/ioctl32.c | 4 +--- arch/sparc64/kernel/ioctl32.c | 3 --- fs/compat_ioctl.c | 4 ++++ 4 files changed, 5 insertions(+), 11 deletions(-) diff -puN arch/parisc/kernel/ioctl32.c~tioc-compat-ioctl-handling arch/parisc/kernel/ioctl32.c --- 25/arch/parisc/kernel/ioctl32.c~tioc-compat-ioctl-handling Tue Sep 20 16:01:12 2005 +++ 25-akpm/arch/parisc/kernel/ioctl32.c Tue Sep 20 16:01:12 2005 @@ -37,11 +37,6 @@ IOCTL_TABLE_START #define DECLARES #include "compat_ioctl.c" -/* Might be moved to compat_ioctl.h with some ifdefs... */ -COMPATIBLE_IOCTL(TIOCSTART) -COMPATIBLE_IOCTL(TIOCSTOP) -COMPATIBLE_IOCTL(TIOCSLTC) - /* PA-specific ioctls */ COMPATIBLE_IOCTL(PA_PERF_ON) COMPATIBLE_IOCTL(PA_PERF_OFF) diff -puN arch/ppc64/kernel/ioctl32.c~tioc-compat-ioctl-handling arch/ppc64/kernel/ioctl32.c --- 25/arch/ppc64/kernel/ioctl32.c~tioc-compat-ioctl-handling Tue Sep 20 16:01:12 2005 +++ 25-akpm/arch/ppc64/kernel/ioctl32.c Tue Sep 20 16:01:12 2005 @@ -39,9 +39,7 @@ IOCTL_TABLE_START #include #define DECLARES #include "compat_ioctl.c" -COMPATIBLE_IOCTL(TIOCSTART) -COMPATIBLE_IOCTL(TIOCSTOP) -COMPATIBLE_IOCTL(TIOCSLTC) + /* Little p (/dev/rtc, /dev/envctrl, etc.) */ COMPATIBLE_IOCTL(_IOR('p', 20, int[7])) /* RTCGET */ COMPATIBLE_IOCTL(_IOW('p', 21, int[7])) /* RTCSET */ diff -puN arch/sparc64/kernel/ioctl32.c~tioc-compat-ioctl-handling arch/sparc64/kernel/ioctl32.c --- 25/arch/sparc64/kernel/ioctl32.c~tioc-compat-ioctl-handling Tue Sep 20 16:01:12 2005 +++ 25-akpm/arch/sparc64/kernel/ioctl32.c Tue Sep 20 16:01:12 2005 @@ -124,9 +124,6 @@ IOCTL_TABLE_START #include #define DECLARES #include "compat_ioctl.c" -COMPATIBLE_IOCTL(TIOCSTART) -COMPATIBLE_IOCTL(TIOCSTOP) -COMPATIBLE_IOCTL(TIOCSLTC) COMPATIBLE_IOCTL(FBIOGTYPE) COMPATIBLE_IOCTL(FBIOSATTR) COMPATIBLE_IOCTL(FBIOGATTR) diff -puN fs/compat_ioctl.c~tioc-compat-ioctl-handling fs/compat_ioctl.c --- 25/fs/compat_ioctl.c~tioc-compat-ioctl-handling Tue Sep 20 16:01:12 2005 +++ 25-akpm/fs/compat_ioctl.c Tue Sep 20 16:01:12 2005 @@ -3046,6 +3046,10 @@ HANDLE_IOCTL(RAW_GETBIND, raw_ioctl) /* Serial */ HANDLE_IOCTL(TIOCGSERIAL, serial_struct_ioctl) HANDLE_IOCTL(TIOCSSERIAL, serial_struct_ioctl) +#ifdef TIOCGLTC +COMPATIBLE_IOCTL(TIOCGLTC) +COMPATIBLE_IOCTL(TIOCSLTC) +#endif /* Usbdevfs */ HANDLE_IOCTL(USBDEVFS_CONTROL32, do_usbdevfs_control) HANDLE_IOCTL(USBDEVFS_BULK32, do_usbdevfs_bulk) _