diff options
| author | Ingo Molnar | 2019-04-26 12:01:33 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2019-04-26 12:01:33 +0200 |
| commit | da398dbd7d871bae332a800f7d194af18a2a9058 (patch) | |
| tree | 2dbdc51bd9caa1539480b3d80d082adfdb8179c3 /arch/sparc/kernel/syscalls/syscall.tbl | |
| parent | x86/Kconfig: Deprecate DISCONTIGMEM support for 32-bit x86 (diff) | |
| parent | Merge tag 'ceph-for-5.1-rc7' of git://github.com/ceph/ceph-client (diff) | |
| download | kernel-qcow2-linux-da398dbd7d871bae332a800f7d194af18a2a9058.tar.gz kernel-qcow2-linux-da398dbd7d871bae332a800f7d194af18a2a9058.tar.xz kernel-qcow2-linux-da398dbd7d871bae332a800f7d194af18a2a9058.zip | |
Merge branch 'linus' into x86/mm, to pick up dependent fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/sparc/kernel/syscalls/syscall.tbl')
| -rw-r--r-- | arch/sparc/kernel/syscalls/syscall.tbl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/sparc/kernel/syscalls/syscall.tbl b/arch/sparc/kernel/syscalls/syscall.tbl index b9a5a04b2d2c..a1dd24307b00 100644 --- a/arch/sparc/kernel/syscalls/syscall.tbl +++ b/arch/sparc/kernel/syscalls/syscall.tbl @@ -469,3 +469,7 @@ 421 32 rt_sigtimedwait_time64 sys_rt_sigtimedwait compat_sys_rt_sigtimedwait_time64 422 32 futex_time64 sys_futex sys_futex 423 32 sched_rr_get_interval_time64 sys_sched_rr_get_interval sys_sched_rr_get_interval +424 common pidfd_send_signal sys_pidfd_send_signal +425 common io_uring_setup sys_io_uring_setup +426 common io_uring_enter sys_io_uring_enter +427 common io_uring_register sys_io_uring_register |