Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6-omap-h63xx.git] / arch / x86_64 / ia32 / ia32_ioctl.c

diff --git a/arch/x86_64/ia32/ia32_ioctl.c b/arch/x86_64/ia32/ia32_ioctl.c
index 0ad5cc33b45a906690ed4e572d9f2324de3debd2..e335bd0b637d705a4c73e28f6c773340617da072 100644 (file)
--- a/arch/x86_64/ia32/ia32_ioctl.c
+++ b/arch/x86_64/ia32/ia32_ioctl.c
@@ -17,34 +17,6 @@
 #define CODE
 #include "compat_ioctl.c"
   
-#ifndef TIOCGDEV
-#define TIOCGDEV       _IOR('T',0x32, unsigned int)
-#endif
-static int tiocgdev(unsigned fd, unsigned cmd,  unsigned int __user *ptr) 
-{ 
-
-       struct file *file;
-       struct tty_struct *real_tty;
-       int fput_needed, ret;
-
-       file = fget_light(fd, &fput_needed);
-       if (!file)
-               return -EBADF;
-
-       ret = -EINVAL;
-       if (file->f_op->ioctl != tty_ioctl)
-               goto out;
-       real_tty = (struct tty_struct *)file->private_data;
-       if (!real_tty)  
-               goto out;
-
-       ret = put_user(new_encode_dev(tty_devnum(real_tty)), ptr); 
-
-out:
-       fput_light(file, fput_needed);
-       return ret;
-} 
-
 #define RTC_IRQP_READ32        _IOR('p', 0x0b, unsigned int)    /* Read IRQ rate   */
 #define RTC_IRQP_SET32 _IOW('p', 0x0c, unsigned int)    /* Set IRQ rate    */
 #define RTC_EPOCH_READ32       _IOR('p', 0x0d, unsigned)        /* Read epoch      */
@@ -92,15 +64,8 @@ struct ioctl_trans ioctl_start[] = {
 #include <linux/compat_ioctl.h>
 #define DECLARES
 #include "compat_ioctl.c"
-COMPATIBLE_IOCTL(HDIO_SET_KEEPSETTINGS)
-COMPATIBLE_IOCTL(HDIO_SCAN_HWIF)
-COMPATIBLE_IOCTL(BLKRASET)
-COMPATIBLE_IOCTL(0x4B50)   /* KDGHWCLK - not in the kernel, but don't complain */
-COMPATIBLE_IOCTL(0x4B51)   /* KDSHWCLK - not in the kernel, but don't complain */
-COMPATIBLE_IOCTL(FIOQSIZE)
 
 /* And these ioctls need translation */
-HANDLE_IOCTL(TIOCGDEV, tiocgdev)
 /* realtime device */
 HANDLE_IOCTL(RTC_IRQP_READ,  rtc32_ioctl)
 HANDLE_IOCTL(RTC_IRQP_READ32,rtc32_ioctl)