diff options
-rw-r--r-- | arch/parisc/kernel/ioctl32.c | 5 | ||||
-rw-r--r-- | arch/ppc64/kernel/ioctl32.c | 4 | ||||
-rw-r--r-- | arch/sparc64/kernel/ioctl32.c | 3 | ||||
-rw-r--r-- | fs/compat_ioctl.c | 4 |
4 files changed, 5 insertions, 11 deletions
diff --git a/arch/parisc/kernel/ioctl32.c b/arch/parisc/kernel/ioctl32.c index 8cad8f004f00..0a331104ad56 100644 --- a/arch/parisc/kernel/ioctl32.c +++ b/arch/parisc/kernel/ioctl32.c | |||
@@ -561,11 +561,6 @@ IOCTL_TABLE_START | |||
561 | #define DECLARES | 561 | #define DECLARES |
562 | #include "compat_ioctl.c" | 562 | #include "compat_ioctl.c" |
563 | 563 | ||
564 | /* Might be moved to compat_ioctl.h with some ifdefs... */ | ||
565 | COMPATIBLE_IOCTL(TIOCSTART) | ||
566 | COMPATIBLE_IOCTL(TIOCSTOP) | ||
567 | COMPATIBLE_IOCTL(TIOCSLTC) | ||
568 | |||
569 | /* PA-specific ioctls */ | 564 | /* PA-specific ioctls */ |
570 | COMPATIBLE_IOCTL(PA_PERF_ON) | 565 | COMPATIBLE_IOCTL(PA_PERF_ON) |
571 | COMPATIBLE_IOCTL(PA_PERF_OFF) | 566 | COMPATIBLE_IOCTL(PA_PERF_OFF) |
diff --git a/arch/ppc64/kernel/ioctl32.c b/arch/ppc64/kernel/ioctl32.c index a8005db23ec5..ba4a899045c2 100644 --- a/arch/ppc64/kernel/ioctl32.c +++ b/arch/ppc64/kernel/ioctl32.c | |||
@@ -39,9 +39,7 @@ IOCTL_TABLE_START | |||
39 | #include <linux/compat_ioctl.h> | 39 | #include <linux/compat_ioctl.h> |
40 | #define DECLARES | 40 | #define DECLARES |
41 | #include "compat_ioctl.c" | 41 | #include "compat_ioctl.c" |
42 | COMPATIBLE_IOCTL(TIOCSTART) | 42 | |
43 | COMPATIBLE_IOCTL(TIOCSTOP) | ||
44 | COMPATIBLE_IOCTL(TIOCSLTC) | ||
45 | /* Little p (/dev/rtc, /dev/envctrl, etc.) */ | 43 | /* Little p (/dev/rtc, /dev/envctrl, etc.) */ |
46 | COMPATIBLE_IOCTL(_IOR('p', 20, int[7])) /* RTCGET */ | 44 | COMPATIBLE_IOCTL(_IOR('p', 20, int[7])) /* RTCGET */ |
47 | COMPATIBLE_IOCTL(_IOW('p', 21, int[7])) /* RTCSET */ | 45 | COMPATIBLE_IOCTL(_IOW('p', 21, int[7])) /* RTCSET */ |
diff --git a/arch/sparc64/kernel/ioctl32.c b/arch/sparc64/kernel/ioctl32.c index 43fc3173d480..e6a00325075a 100644 --- a/arch/sparc64/kernel/ioctl32.c +++ b/arch/sparc64/kernel/ioctl32.c | |||
@@ -475,9 +475,6 @@ IOCTL_TABLE_START | |||
475 | #include <linux/compat_ioctl.h> | 475 | #include <linux/compat_ioctl.h> |
476 | #define DECLARES | 476 | #define DECLARES |
477 | #include "compat_ioctl.c" | 477 | #include "compat_ioctl.c" |
478 | COMPATIBLE_IOCTL(TIOCSTART) | ||
479 | COMPATIBLE_IOCTL(TIOCSTOP) | ||
480 | COMPATIBLE_IOCTL(TIOCSLTC) | ||
481 | COMPATIBLE_IOCTL(FBIOGTYPE) | 478 | COMPATIBLE_IOCTL(FBIOGTYPE) |
482 | COMPATIBLE_IOCTL(FBIOSATTR) | 479 | COMPATIBLE_IOCTL(FBIOSATTR) |
483 | COMPATIBLE_IOCTL(FBIOGATTR) | 480 | COMPATIBLE_IOCTL(FBIOGATTR) |
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index a327e03753ac..43dbcb0b21eb 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c | |||
@@ -3046,6 +3046,10 @@ HANDLE_IOCTL(RAW_GETBIND, raw_ioctl) | |||
3046 | /* Serial */ | 3046 | /* Serial */ |
3047 | HANDLE_IOCTL(TIOCGSERIAL, serial_struct_ioctl) | 3047 | HANDLE_IOCTL(TIOCGSERIAL, serial_struct_ioctl) |
3048 | HANDLE_IOCTL(TIOCSSERIAL, serial_struct_ioctl) | 3048 | HANDLE_IOCTL(TIOCSSERIAL, serial_struct_ioctl) |
3049 | #ifdef TIOCGLTC | ||
3050 | COMPATIBLE_IOCTL(TIOCGLTC) | ||
3051 | COMPATIBLE_IOCTL(TIOCSLTC) | ||
3052 | #endif | ||
3049 | /* Usbdevfs */ | 3053 | /* Usbdevfs */ |
3050 | HANDLE_IOCTL(USBDEVFS_CONTROL32, do_usbdevfs_control) | 3054 | HANDLE_IOCTL(USBDEVFS_CONTROL32, do_usbdevfs_control) |
3051 | HANDLE_IOCTL(USBDEVFS_BULK32, do_usbdevfs_bulk) | 3055 | HANDLE_IOCTL(USBDEVFS_BULK32, do_usbdevfs_bulk) |