Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae6be51e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Fix up prototype for sys_ipc breakage 



Commit 45575f5a ("ppc64 sys_ipc breakage in 2.6.34-rc2") fixed the
definition of the sys_ipc() helper, but didn't fix the prototype in
<linux/syscalls.h>

Reported-and-tested-by: default avatarAndreas Schwab <schwab@linux-m68k.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7b1f513a

include/linux/syscalls.h

+1 −1
Original line number Diff line number Diff line
@@ -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);