Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Richard Weinberger and committed by
Linus Torvalds
8a06dc4d 13e165ba

+4 -4
+2 -2
arch/um/drivers/line.c
··· 255 255 { KDSIGACCEPT, KERN_INFO, "KDSIGACCEPT" }, 256 256 }; 257 257 258 - int line_ioctl(struct tty_struct *tty, struct file * file, 259 - unsigned int cmd, unsigned long arg) 258 + int line_ioctl(struct tty_struct *tty, unsigned int cmd, 259 + unsigned long arg) 260 260 { 261 261 int ret; 262 262 int i;
+2 -2
arch/um/include/shared/line.h
··· 77 77 extern void line_flush_buffer(struct tty_struct *tty); 78 78 extern void line_flush_chars(struct tty_struct *tty); 79 79 extern int line_write_room(struct tty_struct *tty); 80 - extern int line_ioctl(struct tty_struct *tty, struct file * file, 81 - unsigned int cmd, unsigned long arg); 80 + extern int line_ioctl(struct tty_struct *tty, unsigned int cmd, 81 + unsigned long arg); 82 82 extern void line_throttle(struct tty_struct *tty); 83 83 extern void line_unthrottle(struct tty_struct *tty); 84 84