diff options
| author | Richard Weinberger <richard@nod.at> | 2011-03-22 16:33:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-22 17:44:09 -0700 |
| commit | 8a06dc4d52458e4a909b652ee9fe8f82d2cd87a2 (patch) | |
| tree | 94cb701af633cc4ff7522a0f0eb559cd56afd537 /arch | |
| parent | 13e165baf6ada9f427c319bd41a1c7a9c7b4f0a6 (diff) | |
| download | linux-3.10-8a06dc4d52458e4a909b652ee9fe8f82d2cd87a2.tar.gz linux-3.10-8a06dc4d52458e4a909b652ee9fe8f82d2cd87a2.tar.bz2 linux-3.10-8a06dc4d52458e4a909b652ee9fe8f82d2cd87a2.zip | |
um: remove file pointer from ioctl
Commit 6caa76b ("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: Richard 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/um/drivers/line.c | 4 | ||||
| -rw-r--r-- | arch/um/include/shared/line.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c index 050e4ddbbb6..35dd0b86401 100644 --- a/arch/um/drivers/line.c +++ b/arch/um/drivers/line.c @@ -255,8 +255,8 @@ static const struct { { KDSIGACCEPT, KERN_INFO, "KDSIGACCEPT" }, }; -int line_ioctl(struct tty_struct *tty, struct file * file, - unsigned int cmd, unsigned long arg) +int line_ioctl(struct tty_struct *tty, unsigned int cmd, + unsigned long arg) { int ret; int i; diff --git a/arch/um/include/shared/line.h b/arch/um/include/shared/line.h index 311a0d3d93a..72f4f25af24 100644 --- a/arch/um/include/shared/line.h +++ b/arch/um/include/shared/line.h @@ -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_chars(struct tty_struct *tty); extern int line_write_room(struct tty_struct *tty); -extern int line_ioctl(struct tty_struct *tty, struct file * file, - unsigned int cmd, unsigned long arg); +extern int line_ioctl(struct tty_struct *tty, unsigned int cmd, + unsigned long arg); extern void line_throttle(struct tty_struct *tty); extern void line_unthrottle(struct tty_struct *tty); |