aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-04-23 16:34:17 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2019-04-23 16:34:17 -0400
commitd286e13d53f54b00bcd7443eedd067cd432cf547 (patch)
tree430fa735575c6835bf065c08bcc2f4babde0c09d
parent7142eaa58b49d9de492ccc16d48df7c488a5fbb6 (diff)
parent39036cd2727395c3369b1051005da74059a85317 (diff)
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
-rw-r--r--arch/alpha/kernel/syscalls/syscall.tbl4
-rw-r--r--arch/arm/tools/syscall.tbl4
-rw-r--r--arch/arm64/include/asm/unistd.h2
-rw-r--r--arch/arm64/include/asm/unistd32.h8
-rw-r--r--arch/ia64/kernel/syscalls/syscall.tbl4
-rw-r--r--arch/m68k/kernel/syscalls/syscall.tbl4
-rw-r--r--arch/microblaze/kernel/syscalls/syscall.tbl4
-rw-r--r--arch/mips/kernel/syscalls/syscall_n32.tbl4
-rw-r--r--arch/mips/kernel/syscalls/syscall_n64.tbl4
-rw-r--r--arch/mips/kernel/syscalls/syscall_o32.tbl4
-rw-r--r--arch/parisc/kernel/syscalls/syscall.tbl4
-rw-r--r--arch/powerpc/kernel/syscalls/syscall.tbl4
-rw-r--r--arch/s390/kernel/syscalls/syscall.tbl4
-rw-r--r--arch/sh/kernel/syscalls/syscall.tbl4
-rw-r--r--arch/sparc/kernel/syscalls/syscall.tbl4
-rw-r--r--arch/xtensa/kernel/syscalls/syscall.tbl4
16 files changed, 65 insertions, 1 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 @@
463532 common getppid sys_getppid 463532 common getppid sys_getppid
464# all other architectures have common numbers for new syscall, alpha 464# all other architectures have common numbers for new syscall, alpha
465# is the exception. 465# is the exception.
466534 common pidfd_send_signal sys_pidfd_send_signal
467535 common io_uring_setup sys_io_uring_setup
468536 common io_uring_enter sys_io_uring_enter
469537 common io_uring_register sys_io_uring_register
diff --git a/arch/arm/tools/syscall.tbl b/arch/arm/tools/syscall.tbl
index 9016f4081bb9..0393917eaa57 100644
--- a/arch/arm/tools/syscall.tbl
+++ b/arch/arm/tools/syscall.tbl
@@ -437,3 +437,7 @@
437421 common rt_sigtimedwait_time64 sys_rt_sigtimedwait 437421 common rt_sigtimedwait_time64 sys_rt_sigtimedwait
438422 common futex_time64 sys_futex 438422 common futex_time64 sys_futex
439423 common sched_rr_get_interval_time64 sys_sched_rr_get_interval 439423 common sched_rr_get_interval_time64 sys_sched_rr_get_interval
440424 common pidfd_send_signal sys_pidfd_send_signal
441425 common io_uring_setup sys_io_uring_setup
442426 common io_uring_enter sys_io_uring_enter
443427 common io_uring_register sys_io_uring_register
diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h
index d1dd93436e1e..f2a83ff6b73c 100644
--- a/arch/arm64/include/asm/unistd.h
+++ b/arch/arm64/include/asm/unistd.h
@@ -44,7 +44,7 @@
44#define __ARM_NR_compat_set_tls (__ARM_NR_COMPAT_BASE + 5) 44#define __ARM_NR_compat_set_tls (__ARM_NR_COMPAT_BASE + 5)
45#define __ARM_NR_COMPAT_END (__ARM_NR_COMPAT_BASE + 0x800) 45#define __ARM_NR_COMPAT_END (__ARM_NR_COMPAT_BASE + 0x800)
46 46
47#define __NR_compat_syscalls 424 47#define __NR_compat_syscalls 428
48#endif 48#endif
49 49
50#define __ARCH_WANT_SYS_CLONE 50#define __ARCH_WANT_SYS_CLONE
diff --git a/arch/arm64/include/asm/unistd32.h b/arch/arm64/include/asm/unistd32.h
index 5590f2623690..23f1a44acada 100644
--- a/arch/arm64/include/asm/unistd32.h
+++ b/arch/arm64/include/asm/unistd32.h
@@ -866,6 +866,14 @@ __SYSCALL(__NR_rt_sigtimedwait_time64, compat_sys_rt_sigtimedwait_time64)
866__SYSCALL(__NR_futex_time64, sys_futex) 866__SYSCALL(__NR_futex_time64, sys_futex)
867#define __NR_sched_rr_get_interval_time64 423 867#define __NR_sched_rr_get_interval_time64 423
868__SYSCALL(__NR_sched_rr_get_interval_time64, sys_sched_rr_get_interval) 868__SYSCALL(__NR_sched_rr_get_interval_time64, sys_sched_rr_get_interval)
869#define __NR_pidfd_send_signal 424
870__SYSCALL(__NR_pidfd_send_signal, sys_pidfd_send_signal)
871#define __NR_io_uring_setup 425
872__SYSCALL(__NR_io_uring_setup, sys_io_uring_setup)
873#define __NR_io_uring_enter 426
874__SYSCALL(__NR_io_uring_enter, sys_io_uring_enter)
875#define __NR_io_uring_register 427
876__SYSCALL(__NR_io_uring_register, sys_io_uring_register)
869 877
870/* 878/*
871 * Please add new compat syscalls above this comment and update 879 * Please add new compat syscalls above this comment and update
diff --git a/arch/ia64/kernel/syscalls/syscall.tbl b/arch/ia64/kernel/syscalls/syscall.tbl
index ab9cda5f6136..56e3d0b685e1 100644
--- a/arch/ia64/kernel/syscalls/syscall.tbl
+++ b/arch/ia64/kernel/syscalls/syscall.tbl
@@ -344,3 +344,7 @@
344332 common pkey_free sys_pkey_free 344332 common pkey_free sys_pkey_free
345333 common rseq sys_rseq 345333 common rseq sys_rseq
346# 334 through 423 are reserved to sync up with other architectures 346# 334 through 423 are reserved to sync up with other architectures
347424 common pidfd_send_signal sys_pidfd_send_signal
348425 common io_uring_setup sys_io_uring_setup
349426 common io_uring_enter sys_io_uring_enter
350427 common io_uring_register sys_io_uring_register
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 @@
423421 common rt_sigtimedwait_time64 sys_rt_sigtimedwait 423421 common rt_sigtimedwait_time64 sys_rt_sigtimedwait
424422 common futex_time64 sys_futex 424422 common futex_time64 sys_futex
425423 common sched_rr_get_interval_time64 sys_sched_rr_get_interval 425423 common sched_rr_get_interval_time64 sys_sched_rr_get_interval
426424 common pidfd_send_signal sys_pidfd_send_signal
427425 common io_uring_setup sys_io_uring_setup
428426 common io_uring_enter sys_io_uring_enter
429427 common io_uring_register sys_io_uring_register
diff --git a/arch/microblaze/kernel/syscalls/syscall.tbl b/arch/microblaze/kernel/syscalls/syscall.tbl
index 8ee3a8c18498..4964947732af 100644
--- a/arch/microblaze/kernel/syscalls/syscall.tbl
+++ b/arch/microblaze/kernel/syscalls/syscall.tbl
@@ -429,3 +429,7 @@
429421 common rt_sigtimedwait_time64 sys_rt_sigtimedwait 429421 common rt_sigtimedwait_time64 sys_rt_sigtimedwait
430422 common futex_time64 sys_futex 430422 common futex_time64 sys_futex
431423 common sched_rr_get_interval_time64 sys_sched_rr_get_interval 431423 common sched_rr_get_interval_time64 sys_sched_rr_get_interval
432424 common pidfd_send_signal sys_pidfd_send_signal
433425 common io_uring_setup sys_io_uring_setup
434426 common io_uring_enter sys_io_uring_enter
435427 common io_uring_register sys_io_uring_register
diff --git a/arch/mips/kernel/syscalls/syscall_n32.tbl b/arch/mips/kernel/syscalls/syscall_n32.tbl
index 15f4117900ee..9392dfe33f97 100644
--- a/arch/mips/kernel/syscalls/syscall_n32.tbl
+++ b/arch/mips/kernel/syscalls/syscall_n32.tbl
@@ -362,3 +362,7 @@
362421 n32 rt_sigtimedwait_time64 compat_sys_rt_sigtimedwait_time64 362421 n32 rt_sigtimedwait_time64 compat_sys_rt_sigtimedwait_time64
363422 n32 futex_time64 sys_futex 363422 n32 futex_time64 sys_futex
364423 n32 sched_rr_get_interval_time64 sys_sched_rr_get_interval 364423 n32 sched_rr_get_interval_time64 sys_sched_rr_get_interval
365424 n32 pidfd_send_signal sys_pidfd_send_signal
366425 n32 io_uring_setup sys_io_uring_setup
367426 n32 io_uring_enter sys_io_uring_enter
368427 n32 io_uring_register sys_io_uring_register
diff --git a/arch/mips/kernel/syscalls/syscall_n64.tbl b/arch/mips/kernel/syscalls/syscall_n64.tbl
index c85502e67b44..cd0c8aa21fba 100644
--- a/arch/mips/kernel/syscalls/syscall_n64.tbl
+++ b/arch/mips/kernel/syscalls/syscall_n64.tbl
@@ -338,3 +338,7 @@
338327 n64 rseq sys_rseq 338327 n64 rseq sys_rseq
339328 n64 io_pgetevents sys_io_pgetevents 339328 n64 io_pgetevents sys_io_pgetevents
340# 329 through 423 are reserved to sync up with other architectures 340# 329 through 423 are reserved to sync up with other architectures
341424 n64 pidfd_send_signal sys_pidfd_send_signal
342425 n64 io_uring_setup sys_io_uring_setup
343426 n64 io_uring_enter sys_io_uring_enter
344427 n64 io_uring_register sys_io_uring_register
diff --git a/arch/mips/kernel/syscalls/syscall_o32.tbl b/arch/mips/kernel/syscalls/syscall_o32.tbl
index 2e063d0f837e..e849e8ffe4a2 100644
--- a/arch/mips/kernel/syscalls/syscall_o32.tbl
+++ b/arch/mips/kernel/syscalls/syscall_o32.tbl
@@ -411,3 +411,7 @@
411421 o32 rt_sigtimedwait_time64 sys_rt_sigtimedwait compat_sys_rt_sigtimedwait_time64 411421 o32 rt_sigtimedwait_time64 sys_rt_sigtimedwait compat_sys_rt_sigtimedwait_time64
412422 o32 futex_time64 sys_futex sys_futex 412422 o32 futex_time64 sys_futex sys_futex
413423 o32 sched_rr_get_interval_time64 sys_sched_rr_get_interval sys_sched_rr_get_interval 413423 o32 sched_rr_get_interval_time64 sys_sched_rr_get_interval sys_sched_rr_get_interval
414424 o32 pidfd_send_signal sys_pidfd_send_signal
415425 o32 io_uring_setup sys_io_uring_setup
416426 o32 io_uring_enter sys_io_uring_enter
417427 o32 io_uring_register sys_io_uring_register
diff --git a/arch/parisc/kernel/syscalls/syscall.tbl b/arch/parisc/kernel/syscalls/syscall.tbl
index b26766c6647d..fe8ca623add8 100644
--- a/arch/parisc/kernel/syscalls/syscall.tbl
+++ b/arch/parisc/kernel/syscalls/syscall.tbl
@@ -420,3 +420,7 @@
420421 32 rt_sigtimedwait_time64 sys_rt_sigtimedwait compat_sys_rt_sigtimedwait_time64 420421 32 rt_sigtimedwait_time64 sys_rt_sigtimedwait compat_sys_rt_sigtimedwait_time64
421422 32 futex_time64 sys_futex sys_futex 421422 32 futex_time64 sys_futex sys_futex
422423 32 sched_rr_get_interval_time64 sys_sched_rr_get_interval sys_sched_rr_get_interval 422423 32 sched_rr_get_interval_time64 sys_sched_rr_get_interval sys_sched_rr_get_interval
423424 common pidfd_send_signal sys_pidfd_send_signal
424425 common io_uring_setup sys_io_uring_setup
425426 common io_uring_enter sys_io_uring_enter
426427 common io_uring_register sys_io_uring_register
diff --git a/arch/powerpc/kernel/syscalls/syscall.tbl b/arch/powerpc/kernel/syscalls/syscall.tbl
index b18abb0c3dae..00f5a63c8d9a 100644
--- a/arch/powerpc/kernel/syscalls/syscall.tbl
+++ b/arch/powerpc/kernel/syscalls/syscall.tbl
@@ -505,3 +505,7 @@
505421 32 rt_sigtimedwait_time64 sys_rt_sigtimedwait compat_sys_rt_sigtimedwait_time64 505421 32 rt_sigtimedwait_time64 sys_rt_sigtimedwait compat_sys_rt_sigtimedwait_time64
506422 32 futex_time64 sys_futex sys_futex 506422 32 futex_time64 sys_futex sys_futex
507423 32 sched_rr_get_interval_time64 sys_sched_rr_get_interval sys_sched_rr_get_interval 507423 32 sched_rr_get_interval_time64 sys_sched_rr_get_interval sys_sched_rr_get_interval
508424 common pidfd_send_signal sys_pidfd_send_signal
509425 common io_uring_setup sys_io_uring_setup
510426 common io_uring_enter sys_io_uring_enter
511427 common io_uring_register sys_io_uring_register
diff --git a/arch/s390/kernel/syscalls/syscall.tbl b/arch/s390/kernel/syscalls/syscall.tbl
index 02579f95f391..061418f787c3 100644
--- a/arch/s390/kernel/syscalls/syscall.tbl
+++ b/arch/s390/kernel/syscalls/syscall.tbl
@@ -426,3 +426,7 @@
426421 32 rt_sigtimedwait_time64 - compat_sys_rt_sigtimedwait_time64 426421 32 rt_sigtimedwait_time64 - compat_sys_rt_sigtimedwait_time64
427422 32 futex_time64 - sys_futex 427422 32 futex_time64 - sys_futex
428423 32 sched_rr_get_interval_time64 - sys_sched_rr_get_interval 428423 32 sched_rr_get_interval_time64 - sys_sched_rr_get_interval
429424 common pidfd_send_signal sys_pidfd_send_signal sys_pidfd_send_signal
430425 common io_uring_setup sys_io_uring_setup sys_io_uring_setup
431426 common io_uring_enter sys_io_uring_enter sys_io_uring_enter
432427 common io_uring_register sys_io_uring_register sys_io_uring_register
diff --git a/arch/sh/kernel/syscalls/syscall.tbl b/arch/sh/kernel/syscalls/syscall.tbl
index bfda678576e4..480b057556ee 100644
--- a/arch/sh/kernel/syscalls/syscall.tbl
+++ b/arch/sh/kernel/syscalls/syscall.tbl
@@ -426,3 +426,7 @@
426421 common rt_sigtimedwait_time64 sys_rt_sigtimedwait 426421 common rt_sigtimedwait_time64 sys_rt_sigtimedwait
427422 common futex_time64 sys_futex 427422 common futex_time64 sys_futex
428423 common sched_rr_get_interval_time64 sys_sched_rr_get_interval 428423 common sched_rr_get_interval_time64 sys_sched_rr_get_interval
429424 common pidfd_send_signal sys_pidfd_send_signal
430425 common io_uring_setup sys_io_uring_setup
431426 common io_uring_enter sys_io_uring_enter
432427 common io_uring_register sys_io_uring_register
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 @@
469421 32 rt_sigtimedwait_time64 sys_rt_sigtimedwait compat_sys_rt_sigtimedwait_time64 469421 32 rt_sigtimedwait_time64 sys_rt_sigtimedwait compat_sys_rt_sigtimedwait_time64
470422 32 futex_time64 sys_futex sys_futex 470422 32 futex_time64 sys_futex sys_futex
471423 32 sched_rr_get_interval_time64 sys_sched_rr_get_interval sys_sched_rr_get_interval 471423 32 sched_rr_get_interval_time64 sys_sched_rr_get_interval sys_sched_rr_get_interval
472424 common pidfd_send_signal sys_pidfd_send_signal
473425 common io_uring_setup sys_io_uring_setup
474426 common io_uring_enter sys_io_uring_enter
475427 common io_uring_register sys_io_uring_register
diff --git a/arch/xtensa/kernel/syscalls/syscall.tbl b/arch/xtensa/kernel/syscalls/syscall.tbl
index 6af49929de85..30084eaf8422 100644
--- a/arch/xtensa/kernel/syscalls/syscall.tbl
+++ b/arch/xtensa/kernel/syscalls/syscall.tbl
@@ -394,3 +394,7 @@
394421 common rt_sigtimedwait_time64 sys_rt_sigtimedwait 394421 common rt_sigtimedwait_time64 sys_rt_sigtimedwait
395422 common futex_time64 sys_futex 395422 common futex_time64 sys_futex
396423 common sched_rr_get_interval_time64 sys_sched_rr_get_interval 396423 common sched_rr_get_interval_time64 sys_sched_rr_get_interval
397424 common pidfd_send_signal sys_pidfd_send_signal
398425 common io_uring_setup sys_io_uring_setup
399426 common io_uring_enter sys_io_uring_enter
400427 common io_uring_register sys_io_uring_register
generated by cgit v1.2.2 (git 2.25.0) at 2025-05-31 07:06:27 -0400