diff options
| author | David S. Miller | 2019-04-26 05:52:29 +0200 |
|---|---|---|
| committer | David S. Miller | 2019-04-26 05:52:29 +0200 |
| commit | 8b4483658364f05b2e32845c8f445cdfd9452286 (patch) | |
| tree | 4734ef83378b1e90475ec4776ac72dfe16a7249b /arch/alpha | |
| parent | net: sched: flower: refactor reoffload for concurrent access (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | kernel-qcow2-linux-8b4483658364f05b2e32845c8f445cdfd9452286.tar.gz kernel-qcow2-linux-8b4483658364f05b2e32845c8f445cdfd9452286.tar.xz kernel-qcow2-linux-8b4483658364f05b2e32845c8f445cdfd9452286.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two easy cases of overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/kernel/syscalls/syscall.tbl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/alpha/kernel/syscalls/syscall.tbl b/arch/alpha/kernel/syscalls/syscall.tbl index 63ed39cbd3bd..165f268beafc 100644 --- a/arch/alpha/kernel/syscalls/syscall.tbl +++ b/arch/alpha/kernel/syscalls/syscall.tbl @@ -463,3 +463,7 @@ 532 common getppid sys_getppid # all other architectures have common numbers for new syscall, alpha # is the exception. +534 common pidfd_send_signal sys_pidfd_send_signal +535 common io_uring_setup sys_io_uring_setup +536 common io_uring_enter sys_io_uring_enter +537 common io_uring_register sys_io_uring_register |