diff options
author | Christoph Hellwig <hch@lst.de> | 2005-10-30 18:01:41 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 20:37:17 -0500 |
commit | 9c0cbd54ce0397017a823484f9a8054ab369b8a2 (patch) | |
tree | ac199e4dc6602afc3d2039a0dcff070ab294ba24 /arch | |
parent | 61e1a9ea4b425eb8c3b4965c35fe953bd881728f (diff) |
[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>
Diffstat (limited to 'arch')
-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 |
3 files changed, 1 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) |