Messages in this thread Patch in this message | | | Date | Mon, 19 Sep 2005 17:12:44 +0200 | From | Christoph Hellwig <> | Subject | [PATCH] TIOC* compat ioctl handling |
| |
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 <hch@lst.de>
Index: linux-2.6/arch/parisc/kernel/ioctl32.c =================================================================== --- linux-2.6.orig/arch/parisc/kernel/ioctl32.c 2005-09-19 15:18:12.000000000 +0200 +++ linux-2.6/arch/parisc/kernel/ioctl32.c 2005-09-19 15:19:35.000000000 +0200 @@ -37,11 +37,6 @@ #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) Index: linux-2.6/arch/ppc64/kernel/ioctl32.c =================================================================== --- linux-2.6.orig/arch/ppc64/kernel/ioctl32.c 2005-09-18 13:46:55.000000000 +0200 +++ linux-2.6/arch/ppc64/kernel/ioctl32.c 2005-09-19 15:19:35.000000000 +0200 @@ -39,9 +39,7 @@ #include <linux/compat_ioctl.h> #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 */ Index: linux-2.6/arch/sparc64/kernel/ioctl32.c =================================================================== --- linux-2.6.orig/arch/sparc64/kernel/ioctl32.c 2005-09-19 15:18:12.000000000 +0200 +++ linux-2.6/arch/sparc64/kernel/ioctl32.c 2005-09-19 15:19:35.000000000 +0200 @@ -124,9 +124,6 @@ #include <linux/compat_ioctl.h> #define DECLARES #include "compat_ioctl.c" -COMPATIBLE_IOCTL(TIOCSTART) -COMPATIBLE_IOCTL(TIOCSTOP) -COMPATIBLE_IOCTL(TIOCSLTC) COMPATIBLE_IOCTL(FBIOGTYPE) COMPATIBLE_IOCTL(FBIOSATTR) COMPATIBLE_IOCTL(FBIOGATTR) Index: linux-2.6/fs/compat_ioctl.c =================================================================== --- linux-2.6.orig/fs/compat_ioctl.c 2005-09-18 13:47:31.000000000 +0200 +++ linux-2.6/fs/compat_ioctl.c 2005-09-19 15:19:35.000000000 +0200 @@ -3046,6 +3046,10 @@ /* 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) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |