Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 11865
b: refs/heads/master
c: 371e8c2
h: refs/heads/master
i:
  11863: 2518c60
v: v3
  • Loading branch information
Brian Gerst authored and Linus Torvalds committed Oct 31, 2005
1 parent 991877f commit 5fb2f18
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 30 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 381be25458524f9bcec5bf1e40c82d1ebb408475
refs/heads/master: 371e8c25b65f2fe7942868a8a67129d571e94076
29 changes: 0 additions & 29 deletions trunk/arch/x86_64/ia32/ia32_ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -100,7 +72,6 @@ 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)
Expand Down

0 comments on commit 5fb2f18

Please sign in to comment.