diff options
author | Brian Gerst <bgerst@didntduck.org> | 2005-10-30 18:03:00 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 20:37:25 -0500 |
commit | 371e8c25b65f2fe7942868a8a67129d571e94076 (patch) | |
tree | 02364e0434b01ef0778488f1468cd5807d39f4cd | |
parent | 381be25458524f9bcec5bf1e40c82d1ebb408475 (diff) |
[PATCH] Remove orphaned TIOCGDEV compat ioctl
This ioctl doesn't exist for native i386.
Signed-off-by: Brian Gerst <bgerst@didntduck.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | arch/x86_64/ia32/ia32_ioctl.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/arch/x86_64/ia32/ia32_ioctl.c b/arch/x86_64/ia32/ia32_ioctl.c index 0ad5cc33b45a..4ba0e293d5e5 100644 --- a/arch/x86_64/ia32/ia32_ioctl.c +++ b/arch/x86_64/ia32/ia32_ioctl.c | |||
@@ -17,34 +17,6 @@ | |||
17 | #define CODE | 17 | #define CODE |
18 | #include "compat_ioctl.c" | 18 | #include "compat_ioctl.c" |
19 | 19 | ||
20 | #ifndef TIOCGDEV | ||
21 | #define TIOCGDEV _IOR('T',0x32, unsigned int) | ||
22 | #endif | ||
23 | static int tiocgdev(unsigned fd, unsigned cmd, unsigned int __user *ptr) | ||
24 | { | ||
25 | |||
26 | struct file *file; | ||
27 | struct tty_struct *real_tty; | ||
28 | int fput_needed, ret; | ||
29 | |||
30 | file = fget_light(fd, &fput_needed); | ||
31 | if (!file) | ||
32 | return -EBADF; | ||
33 | |||
34 | ret = -EINVAL; | ||
35 | if (file->f_op->ioctl != tty_ioctl) | ||
36 | goto out; | ||
37 | real_tty = (struct tty_struct *)file->private_data; | ||
38 | if (!real_tty) | ||
39 | goto out; | ||
40 | |||
41 | ret = put_user(new_encode_dev(tty_devnum(real_tty)), ptr); | ||
42 | |||
43 | out: | ||
44 | fput_light(file, fput_needed); | ||
45 | return ret; | ||
46 | } | ||
47 | |||
48 | #define RTC_IRQP_READ32 _IOR('p', 0x0b, unsigned int) /* Read IRQ rate */ | 20 | #define RTC_IRQP_READ32 _IOR('p', 0x0b, unsigned int) /* Read IRQ rate */ |
49 | #define RTC_IRQP_SET32 _IOW('p', 0x0c, unsigned int) /* Set IRQ rate */ | 21 | #define RTC_IRQP_SET32 _IOW('p', 0x0c, unsigned int) /* Set IRQ rate */ |
50 | #define RTC_EPOCH_READ32 _IOR('p', 0x0d, unsigned) /* Read epoch */ | 22 | #define RTC_EPOCH_READ32 _IOR('p', 0x0d, unsigned) /* Read epoch */ |
@@ -100,7 +72,6 @@ COMPATIBLE_IOCTL(0x4B51) /* KDSHWCLK - not in the kernel, but don't complain * | |||
100 | COMPATIBLE_IOCTL(FIOQSIZE) | 72 | COMPATIBLE_IOCTL(FIOQSIZE) |
101 | 73 | ||
102 | /* And these ioctls need translation */ | 74 | /* And these ioctls need translation */ |
103 | HANDLE_IOCTL(TIOCGDEV, tiocgdev) | ||
104 | /* realtime device */ | 75 | /* realtime device */ |
105 | HANDLE_IOCTL(RTC_IRQP_READ, rtc32_ioctl) | 76 | HANDLE_IOCTL(RTC_IRQP_READ, rtc32_ioctl) |
106 | HANDLE_IOCTL(RTC_IRQP_READ32,rtc32_ioctl) | 77 | HANDLE_IOCTL(RTC_IRQP_READ32,rtc32_ioctl) |