Commit d286e13d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 7142eaa5 39036cd2

arch/alpha/kernel/syscalls/syscall.tbl

+4 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/tools/syscall.tbl

+4 −0
Original line number Diff line number Diff line
@@ -437,3 +437,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

arch/arm64/include/asm/unistd.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
#define __ARM_NR_compat_set_tls		(__ARM_NR_COMPAT_BASE + 5)

#define __ARM_NR_COMPAT_END		(__ARM_NR_COMPAT_BASE + 0x800)



#define __NR_compat_syscalls		424

#define __NR_compat_syscalls		428

#endif



#define __ARCH_WANT_SYS_CLONE

arch/arm64/include/asm/unistd32.h

+8 −0
Original line number Diff line number Diff line
@@ -866,6 +866,14 @@ __SYSCALL(__NR_rt_sigtimedwait_time64, compat_sys_rt_sigtimedwait_time64) 
__SYSCALL(__NR_futex_time64, sys_futex)

#define __NR_sched_rr_get_interval_time64 423

__SYSCALL(__NR_sched_rr_get_interval_time64, sys_sched_rr_get_interval)

#define __NR_pidfd_send_signal 424

__SYSCALL(__NR_pidfd_send_signal, sys_pidfd_send_signal)

#define __NR_io_uring_setup 425

__SYSCALL(__NR_io_uring_setup, sys_io_uring_setup)

#define __NR_io_uring_enter 426

__SYSCALL(__NR_io_uring_enter, sys_io_uring_enter)

#define __NR_io_uring_register 427

__SYSCALL(__NR_io_uring_register, sys_io_uring_register)



/*

 * Please add new compat syscalls above this comment and update

arch/ia64/kernel/syscalls/syscall.tbl

+4 −0
Original line number Diff line number Diff line
@@ -344,3 +344,7 @@ 
332	common	pkey_free			sys_pkey_free

333	common	rseq				sys_rseq

# 334 through 423 are reserved to sync up with other architectures

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE