aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/compat.h
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2013-01-21 23:15:25 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2013-03-03 23:00:27 -0500
commit56e41d3c5aa84d679eebdb3cb8a70b03c5fbd6c3 (patch)
tree62ede9a6cc31ed46d78632b65c4a66485fd5d1ad /include/linux/compat.h
parentd5dc77bfeeab0b03a32e3db5e31e2f64605634ab (diff)
merge compat sys_ipc instances
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include/linux/compat.h')
-rw-r--r--include/linux/compat.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/compat.h b/include/linux/compat.h
index 482c9e65b5bf..79a4781ac502 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -318,6 +318,7 @@ long compat_sys_msgrcv(int first, int second, int msgtyp, int third,
318 int version, void __user *uptr); 318 int version, void __user *uptr);
319long compat_sys_shmat(int first, int second, compat_uptr_t third, int version, 319long compat_sys_shmat(int first, int second, compat_uptr_t third, int version,
320 void __user *uptr); 320 void __user *uptr);
321asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
321#else 322#else
322long compat_sys_semctl(int semid, int semnum, int cmd, int arg); 323long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
323long compat_sys_msgsnd(int msqid, struct compat_msgbuf __user *msgp, 324long compat_sys_msgsnd(int msqid, struct compat_msgbuf __user *msgp,