This is a note to let you know that I've just added the patch titled
cris: fix the prototype of sync_serial_ioctl()
to the 3.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
cris-fix-the-prototype-of-sync_serial_ioctl.patch
and it can be found in the queue-3.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <sta...@kernel.org> know about it.
>From b4bc281266e84e9a432b588ebdcef5fb94dc8ecb Mon Sep 17 00:00:00 2001
From: WANG Cong <xiyou.wangc...@gmail.com>
Date: Wed, 3 Aug 2011 16:21:14 -0700
Subject: cris: fix the prototype of sync_serial_ioctl()
From: WANG Cong <xiyou.wangc...@gmail.com>
commit b4bc281266e84e9a432b588ebdcef5fb94dc8ecb upstream.
Fix:
arch/cris/arch-v10/drivers/sync_serial.c:961: error: conflicting types for
'sync_serial_ioctl'
Reported-by: Geert Uytterhoeven <ge...@linux-m68k.org>
Signed-off-by: WANG Cong <xiyou.wangc...@gmail.com>
Cc: Mikael Starvik <star...@axis.com>
Cc: Jesper Nilsson <jesper.nils...@axis.com>
Signed-off-by: Andrew Morton <a...@linux-foundation.org>
Signed-off-by: Linus Torvalds <torva...@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gre...@suse.de>
---
arch/cris/arch-v10/drivers/sync_serial.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/arch/cris/arch-v10/drivers/sync_serial.c
+++ b/arch/cris/arch-v10/drivers/sync_serial.c
@@ -158,7 +158,7 @@ static int sync_serial_open(struct inode
static int sync_serial_release(struct inode *inode, struct file *file);
static unsigned int sync_serial_poll(struct file *filp, poll_table *wait);
-static int sync_serial_ioctl(struct file *file,
+static long sync_serial_ioctl(struct file *file,
unsigned int cmd, unsigned long arg);
static ssize_t sync_serial_write(struct file *file, const char *buf,
size_t count, loff_t *ppos);
Patches currently in stable-queue which might be from xiyou.wangc...@gmail.com
are
queue-3.0/cris-add-missing-declaration-of-kgdb_init-and.patch
queue-3.0/cris-fix-a-build-error-in-kernel-fork.c.patch
queue-3.0/cris-fix-a-build-error-in-sync_serial_open.patch
queue-3.0/cris-fix-the-prototype-of-sync_serial_ioctl.patch
_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable
