From: Andrew Morton <akpm@linux-foundation.org>

fs/binfmt_aout.c:40: warning: initialization from incompatible pointer type
fs/binfmt_aout.c:92: error: conflicting types for 'aout_core_dump'
fs/binfmt_aout.c:34: error: previous declaration of 'aout_core_dump' was here

Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
Cc: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/binfmt_aout.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff -puN fs/binfmt_aout.c~allow-individual-core-dump-methods-to-be-unlimited-when-sending-to-a-pipe-fix-2-fix fs/binfmt_aout.c
--- a/fs/binfmt_aout.c~allow-individual-core-dump-methods-to-be-unlimited-when-sending-to-a-pipe-fix-2-fix
+++ a/fs/binfmt_aout.c
@@ -31,7 +31,8 @@
 
 static int load_aout_binary(struct linux_binprm *, struct pt_regs * regs);
 static int load_aout_library(struct file*);
-static int aout_core_dump(long signr, struct pt_regs * regs, struct file *file, u32 limit);
+static int aout_core_dump(long signr, struct pt_regs * regs, struct file *file,
+				unsigned long limit);
 
 static struct linux_binfmt aout_format = {
 	.module		= THIS_MODULE,
_