[PATCH -next] uml: fix tty interface warnings
From: Randy Dunlap <hidden>
Date: 2011-03-16 00:22:38
Also in:
linux-um, lkml
From: Randy Dunlap <redacted> Fix tty interface warnings in arch/um: arch/um/drivers/stdio_console.c:122: warning: initialization from incompatible pointer type arch/um/drivers/ssl.c:139: warning: initialization from incompatible pointer type Signed-off-by: Randy Dunlap <redacted> Cc: Jeff Dike <redacted> Cc: user-mode-linux-devel@lists.sourceforge.net --- arch/um/drivers/line.c | 3 +-- arch/um/include/shared/line.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-)
--- linux-next-20110315.orig/arch/um/drivers/line.c
+++ linux-next-20110315/arch/um/drivers/line.c@@ -255,8 +255,7 @@ 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; --- linux-next-20110315.orig/arch/um/include/shared/line.h +++ linux-next-20110315/arch/um/include/shared/line.h
@@ -77,7 +77,7 @@ extern int line_chars_in_buffer(struct t 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, +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);