From: Randy Dunlap <randy.dunlap@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>, gregkh@suse.de
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
Jeff Dike <jdike@addtoit.com>,
user-mode-linux-devel@lists.sourceforge.net
Subject: [PATCH -next] uml: fix tty interface warnings
Date: Tue, 15 Mar 2011 17:22:08 -0700 [thread overview]
Message-ID: <20110315172208.82934b13.randy.dunlap@oracle.com> (raw)
In-Reply-To: <20110315194543.a5d56c0c.sfr@canb.auug.org.au>
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);
next prev parent reply other threads:[~2011-03-16 0:22 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-15 8:45 linux-next: Tree for March 15 Stephen Rothwell
2011-03-15 15:44 ` linux-next: Tree for March 15 (xen/events.c) Randy Dunlap
2011-03-15 20:45 ` Konrad Rzeszutek Wilk
2011-03-16 0:09 ` [PATCH -next] usb: fix ips1760-hcd printk format warning Randy Dunlap
2011-03-16 0:11 ` [PATCH -next] sunrpc: fix " Randy Dunlap
2011-03-16 0:22 ` Randy Dunlap [this message]
2011-03-16 3:38 ` [PATCH -next] uml: fix tty interface warnings Américo Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110315172208.82934b13.randy.dunlap@oracle.com \
--to=randy.dunlap@oracle.com \
--cc=gregkh@suse.de \
--cc=jdike@addtoit.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=user-mode-linux-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox