Commit 8a06dc4d authored by Richard Weinberger's avatar Richard Weinberger Committed by Linus Torvalds

um: remove file pointer from ioctl

Commit 6caa76b7 ("tty: now phase out the ioctl file pointer for good")
removed the ioctl file pointer.  User Mode Linux's line driver uses this
ioctl and needs a signature update too.
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Greg KH <greg@kroah.com>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 13e165ba
...@@ -255,8 +255,8 @@ static const struct { ...@@ -255,8 +255,8 @@ static const struct {
{ KDSIGACCEPT, KERN_INFO, "KDSIGACCEPT" }, { KDSIGACCEPT, KERN_INFO, "KDSIGACCEPT" },
}; };
int line_ioctl(struct tty_struct *tty, struct file * file, int line_ioctl(struct tty_struct *tty, unsigned int cmd,
unsigned int cmd, unsigned long arg) unsigned long arg)
{ {
int ret; int ret;
int i; int i;
......
...@@ -77,8 +77,8 @@ extern int line_chars_in_buffer(struct tty_struct *tty); ...@@ -77,8 +77,8 @@ extern int line_chars_in_buffer(struct tty_struct *tty);
extern void line_flush_buffer(struct tty_struct *tty); extern void line_flush_buffer(struct tty_struct *tty);
extern void line_flush_chars(struct tty_struct *tty); extern void line_flush_chars(struct tty_struct *tty);
extern int line_write_room(struct tty_struct *tty); extern int line_write_room(struct tty_struct *tty);
extern int line_ioctl(struct tty_struct *tty, struct file * file, extern int line_ioctl(struct tty_struct *tty, unsigned int cmd,
unsigned int cmd, unsigned long arg); unsigned long arg);
extern void line_throttle(struct tty_struct *tty); extern void line_throttle(struct tty_struct *tty);
extern void line_unthrottle(struct tty_struct *tty); extern void line_unthrottle(struct tty_struct *tty);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment