lkml.org 
[lkml]   [2011]   [Mar]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH -next] uml: fix tty interface warnings
From: Randy Dunlap <randy.dunlap@oracle.com>

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 <randy.dunlap@oracle.com>
Cc: Jeff Dike <jdike@addtoit.com>
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);

\
 
 \ /
  Last update: 2011-03-16 01:25    [W:0.059 / U:8.280 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site