ppc64 sys_ipc breakage in 2.6.34-rc2

[Andreas Schwab]

Anton Blanchard <anton at samba.org> writes:

> diff --git a/ipc/syscall.c b/ipc/syscall.c
> index 355a3da..1d6f53f 100644
> --- a/ipc/syscall.c
> +++ b/ipc/syscall.c
> @@ -13,7 +13,7 @@
>  #include <linux/syscalls.h>
>  #include <linux/uaccess.h>
>  
> -SYSCALL_DEFINE6(ipc, unsigned int, call, int, first, int, second,
> +SYSCALL_DEFINE6(ipc, unsigned int, call, int, first, unsigned long, second,
>  		unsigned long, third, void __user *, ptr, long, fifth)

ipc/syscall.c:17: error: conflicting types for ‘sys_ipc’
include/linux/syscalls.h:691: note: previous declaration of ‘sys_ipc’ was here

Andreas.

-- 
Andreas Schwab, schwab at linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."