um: remove file pointer from ioctl (8a06dc4d) · Commits · 戴 / test

Commit ("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>

arch/um/drivers/line.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;

arch/um/include/shared/line.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);

Admin message