On Mon, 22 Mar 2010, Andreas Schwab wrote: > > ipc/syscall.c:17: error: conflicting types for ‘sys_ipc’ > include/linux/syscalls.h:691: note: previous declaration of ‘sys_ipc’ was here
Hmm. Right you are. Why don't I see this? (I already applied the patch) Ahh. Because this only triggers with __ARCH_WANT_SYS_IPC. But why didn't Anton see it then? Anyway, I assume the following fixes it. Can you verify? Linus --- include/linux/syscalls.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index f994ae5..057929b 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h @@ -688,7 +688,7 @@ asmlinkage long sys_shmat(int shmid, char __user *shmaddr, int shmflg); asmlinkage long sys_shmget(key_t key, size_t size, int flag); asmlinkage long sys_shmdt(char __user *shmaddr); asmlinkage long sys_shmctl(int shmid, int cmd, struct shmid_ds __user *buf); -asmlinkage long sys_ipc(unsigned int call, int first, int second, +asmlinkage long sys_ipc(unsigned int call, int first, unsigned long second, unsigned long third, void __user *ptr, long fifth); asmlinkage long sys_mq_open(const char __user *name, int oflag, mode_t mode, struct mq_attr __user *attr); _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev