summaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-04-23 13:34:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-04-23 13:34:17 -0700
commitd286e13d53f54b00bcd7443eedd067cd432cf547 (patch)
tree430fa735575c6835bf065c08bcc2f4babde0c09d /arch/m68k
parent7142eaa58b49d9de492ccc16d48df7c488a5fbb6 (diff)
parent39036cd2727395c3369b1051005da74059a85317 (diff)
downloadlinux-d286e13d53f54b00bcd7443eedd067cd432cf547.tar.bz2
Merge tag 'syscalls-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
Pull syscall numbering updates from Arnd Bergmann: "arch: add pidfd and io_uring syscalls everywhere This comes a bit late, but should be in 5.1 anyway: we want the newly added system calls to be synchronized across all architectures in the release. I hope that in the future, any newly added system calls can be added to all architectures at the same time, and tested there while they are in linux-next, avoiding dependencies between the architecture maintainer trees and the tree that contains the new system call" * tag 'syscalls-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: arch: add pidfd and io_uring syscalls everywhere
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/kernel/syscalls/syscall.tbl4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/m68k/kernel/syscalls/syscall.tbl b/arch/m68k/kernel/syscalls/syscall.tbl
index 125c14178979..df4ec3ec71d1 100644
--- a/arch/m68k/kernel/syscalls/syscall.tbl
+++ b/arch/m68k/kernel/syscalls/syscall.tbl
@@ -423,3 +423,7 @@
421 common rt_sigtimedwait_time64 sys_rt_sigtimedwait
422 common futex_time64 sys_futex
423 common sched_rr_get_interval_time64 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