diff options
| author | Martin Schwidefsky | 2019-01-23 12:39:35 +0100 |
|---|---|---|
| committer | Martin Schwidefsky | 2019-01-23 12:39:35 +0100 |
| commit | 58661489a84c27c42e27feacb1ff8a5faa3a9240 (patch) | |
| tree | cb21af6c4aeca6399d5a991cc65638134423cebd /include/linux/syscalls.h | |
| parent | s390/hypfs: Use struct_size() in kzalloc() (diff) | |
| parent | s390: fix system call tracing (diff) | |
| download | kernel-qcow2-linux-58661489a84c27c42e27feacb1ff8a5faa3a9240.tar.gz kernel-qcow2-linux-58661489a84c27c42e27feacb1ff8a5faa3a9240.tar.xz kernel-qcow2-linux-58661489a84c27c42e27feacb1ff8a5faa3a9240.zip | |
Merge branch 'compat' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux into features
Pull tip branch with Arnds compat system call wrapper rework.
Diffstat (limited to 'include/linux/syscalls.h')
| -rw-r--r-- | include/linux/syscalls.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 257cccba3062..fb63045a0fb6 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h @@ -1185,6 +1185,10 @@ unsigned long ksys_mmap_pgoff(unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags, unsigned long fd, unsigned long pgoff); ssize_t ksys_readahead(int fd, loff_t offset, size_t count); +int ksys_ipc(unsigned int call, int first, unsigned long second, + unsigned long third, void __user * ptr, long fifth); +int compat_ksys_ipc(u32 call, int first, int second, + u32 third, u32 ptr, u32 fifth); /* * The following kernel syscall equivalents are just wrappers to fs-internal |