Skip to content

Commit 568901e

Browse files
committed
tools/include: Sync uapi/asm-generic/unistd.h with the kernel sources
And arch syscall tables to pick up changes from: b1e31c1 powerpc: restore some missing spu syscalls d388256 syscalls: fix compat_sys_io_pgetevents_time64 usage 54233a4 uretprobe: change syscall number, again 63ded11 uprobe: Change uretprobe syscall scope and number 9142be9 x86/syscall: Mark exit[_group] syscall handlers __noreturn 9aae1ba x86, arm: Add missing license tag to syscall tables files 5c28424 syscalls: Fix to add sys_uretprobe to syscall.tbl 190fec7 uprobe: Wire up uretprobe system call This should be used to beautify syscall arguments and it addresses these tools/perf build warnings: Warning: Kernel ABI header differences: diff -u tools/include/uapi/asm-generic/unistd.h include/uapi/asm-generic/unistd.h diff -u tools/perf/arch/x86/entry/syscalls/syscall_64.tbl arch/x86/entry/syscalls/syscall_64.tbl diff -u tools/perf/arch/powerpc/entry/syscalls/syscall.tbl arch/powerpc/kernel/syscalls/syscall.tbl diff -u tools/perf/arch/s390/entry/syscalls/syscall.tbl arch/s390/kernel/syscalls/syscall.tbl Please see tools/include/uapi/README for details (it's in the first patch of this series). Cc: Arnd Bergmann <[email protected]> Cc: [email protected] Signed-off-by: Namhyung Kim <[email protected]>
1 parent b973500 commit 568901e

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

tools/include/uapi/asm-generic/unistd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ __SC_COMP(__NR_pselect6_time64, sys_pselect6, compat_sys_pselect6_time64)
737737
#define __NR_ppoll_time64 414
738738
__SC_COMP(__NR_ppoll_time64, sys_ppoll, compat_sys_ppoll_time64)
739739
#define __NR_io_pgetevents_time64 416
740-
__SYSCALL(__NR_io_pgetevents_time64, sys_io_pgetevents)
740+
__SC_COMP(__NR_io_pgetevents_time64, sys_io_pgetevents, compat_sys_io_pgetevents_time64)
741741
#define __NR_recvmmsg_time64 417
742742
__SC_COMP(__NR_recvmmsg_time64, sys_recvmmsg, compat_sys_recvmmsg_time64)
743743
#define __NR_mq_timedsend_time64 418

tools/perf/arch/powerpc/entry/syscalls/syscall.tbl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,10 @@
230230
178 nospu rt_sigsuspend sys_rt_sigsuspend compat_sys_rt_sigsuspend
231231
179 32 pread64 sys_ppc_pread64 compat_sys_ppc_pread64
232232
179 64 pread64 sys_pread64
233+
179 spu pread64 sys_pread64
233234
180 32 pwrite64 sys_ppc_pwrite64 compat_sys_ppc_pwrite64
234235
180 64 pwrite64 sys_pwrite64
236+
180 spu pwrite64 sys_pwrite64
235237
181 common chown sys_chown
236238
182 common getcwd sys_getcwd
237239
183 common capget sys_capget
@@ -246,6 +248,7 @@
246248
190 common ugetrlimit sys_getrlimit compat_sys_getrlimit
247249
191 32 readahead sys_ppc_readahead compat_sys_ppc_readahead
248250
191 64 readahead sys_readahead
251+
191 spu readahead sys_readahead
249252
192 32 mmap2 sys_mmap2 compat_sys_mmap2
250253
193 32 truncate64 sys_ppc_truncate64 compat_sys_ppc_truncate64
251254
194 32 ftruncate64 sys_ppc_ftruncate64 compat_sys_ppc_ftruncate64
@@ -293,6 +296,7 @@
293296
232 nospu set_tid_address sys_set_tid_address
294297
233 32 fadvise64 sys_ppc32_fadvise64 compat_sys_ppc32_fadvise64
295298
233 64 fadvise64 sys_fadvise64
299+
233 spu fadvise64 sys_fadvise64
296300
234 nospu exit_group sys_exit_group
297301
235 nospu lookup_dcookie sys_ni_syscall
298302
236 common epoll_create sys_epoll_create
@@ -502,7 +506,7 @@
502506
412 32 utimensat_time64 sys_utimensat sys_utimensat
503507
413 32 pselect6_time64 sys_pselect6 compat_sys_pselect6_time64
504508
414 32 ppoll_time64 sys_ppoll compat_sys_ppoll_time64
505-
416 32 io_pgetevents_time64 sys_io_pgetevents sys_io_pgetevents
509+
416 32 io_pgetevents_time64 sys_io_pgetevents compat_sys_io_pgetevents_time64
506510
417 32 recvmmsg_time64 sys_recvmmsg compat_sys_recvmmsg_time64
507511
418 32 mq_timedsend_time64 sys_mq_timedsend sys_mq_timedsend
508512
419 32 mq_timedreceive_time64 sys_mq_timedreceive sys_mq_timedreceive

tools/perf/arch/s390/entry/syscalls/syscall.tbl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@
418418
412 32 utimensat_time64 - sys_utimensat
419419
413 32 pselect6_time64 - compat_sys_pselect6_time64
420420
414 32 ppoll_time64 - compat_sys_ppoll_time64
421-
416 32 io_pgetevents_time64 - sys_io_pgetevents
421+
416 32 io_pgetevents_time64 - compat_sys_io_pgetevents_time64
422422
417 32 recvmmsg_time64 - compat_sys_recvmmsg_time64
423423
418 32 mq_timedsend_time64 - sys_mq_timedsend
424424
419 32 mq_timedreceive_time64 - sys_mq_timedreceive

tools/perf/arch/x86/entry/syscalls/syscall_64.tbl

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
12
#
23
# 64-bit system call numbers and entry vectors
34
#
45
# The format is:
5-
# <number> <abi> <name> <entry point>
6+
# <number> <abi> <name> <entry point> [<compat entry point> [noreturn]]
67
#
78
# The __x64_sys_*() stubs are created on-the-fly for sys_*() system calls
89
#
@@ -68,7 +69,7 @@
6869
57 common fork sys_fork
6970
58 common vfork sys_vfork
7071
59 64 execve sys_execve
71-
60 common exit sys_exit
72+
60 common exit sys_exit - noreturn
7273
61 common wait4 sys_wait4
7374
62 common kill sys_kill
7475
63 common uname sys_newuname
@@ -239,7 +240,7 @@
239240
228 common clock_gettime sys_clock_gettime
240241
229 common clock_getres sys_clock_getres
241242
230 common clock_nanosleep sys_clock_nanosleep
242-
231 common exit_group sys_exit_group
243+
231 common exit_group sys_exit_group - noreturn
243244
232 common epoll_wait sys_epoll_wait
244245
233 common epoll_ctl sys_epoll_ctl
245246
234 common tgkill sys_tgkill
@@ -343,6 +344,7 @@
343344
332 common statx sys_statx
344345
333 common io_pgetevents sys_io_pgetevents
345346
334 common rseq sys_rseq
347+
335 common uretprobe sys_uretprobe
346348
# don't use numbers 387 through 423, add new calls after the last
347349
# 'common' entry
348350
424 common pidfd_send_signal sys_pidfd_send_signal

0 commit comments

Comments
 (0)