[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> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Родитель
61e1a9ea4b
Коммит
9c0cbd54ce
|
@ -561,11 +561,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)
|
||||
|
|
|
@ -39,9 +39,7 @@ IOCTL_TABLE_START
|
|||
#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 */
|
||||
|
|
|
@ -475,9 +475,6 @@ IOCTL_TABLE_START
|
|||
#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)
|
||||
|
|
|
@ -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)
|
||||
|
|
Загрузка…
Ссылка в новой задаче