Commit 568901e7 authored by Namhyung Kim's avatar Namhyung Kim
Browse files

tools/include: Sync uapi/asm-generic/unistd.h with the kernel sources 



And arch syscall tables to pick up changes from:

  b1e31c13 powerpc: restore some missing spu syscalls
  d3882564 syscalls: fix compat_sys_io_pgetevents_time64 usage
  54233a42 uretprobe: change syscall number, again
  63ded110 uprobe: Change uretprobe syscall scope and number
  9142be9e x86/syscall: Mark exit[_group] syscall handlers __noreturn
  9aae1baa x86, arm: Add missing license tag to syscall tables files
  5c28424e syscalls: Fix to add sys_uretprobe to syscall.tbl
  190fec72 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 <arnd@arndb.de>
Cc: linux-arch@vger.kernel.org
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
parent b9735006

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

+1 −1
Original line number Diff line number Diff line
@@ -737,7 +737,7 @@ __SC_COMP(__NR_pselect6_time64, sys_pselect6, compat_sys_pselect6_time64) 
#define __NR_ppoll_time64 414

__SC_COMP(__NR_ppoll_time64, sys_ppoll, compat_sys_ppoll_time64)

#define __NR_io_pgetevents_time64 416

__SYSCALL(__NR_io_pgetevents_time64, sys_io_pgetevents)

__SC_COMP(__NR_io_pgetevents_time64, sys_io_pgetevents, compat_sys_io_pgetevents_time64)

#define __NR_recvmmsg_time64 417

__SC_COMP(__NR_recvmmsg_time64, sys_recvmmsg, compat_sys_recvmmsg_time64)

#define __NR_mq_timedsend_time64 418

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

+5 −1
Original line number Diff line number Diff line
@@ -230,8 +230,10 @@ 
178	nospu 	rt_sigsuspend			sys_rt_sigsuspend		compat_sys_rt_sigsuspend

179	32	pread64				sys_ppc_pread64			compat_sys_ppc_pread64

179	64	pread64				sys_pread64

179	spu	pread64				sys_pread64

180	32	pwrite64			sys_ppc_pwrite64		compat_sys_ppc_pwrite64

180	64	pwrite64			sys_pwrite64

180	spu	pwrite64			sys_pwrite64

181	common	chown				sys_chown

182	common	getcwd				sys_getcwd

183	common	capget				sys_capget
@@ -246,6 +248,7 @@ 
190	common	ugetrlimit			sys_getrlimit			compat_sys_getrlimit

191	32	readahead			sys_ppc_readahead		compat_sys_ppc_readahead

191	64	readahead			sys_readahead

191	spu	readahead			sys_readahead

192	32	mmap2				sys_mmap2			compat_sys_mmap2

193	32	truncate64			sys_ppc_truncate64		compat_sys_ppc_truncate64

194	32	ftruncate64			sys_ppc_ftruncate64		compat_sys_ppc_ftruncate64
@@ -293,6 +296,7 @@ 
232	nospu	set_tid_address			sys_set_tid_address

233	32	fadvise64			sys_ppc32_fadvise64		compat_sys_ppc32_fadvise64

233	64	fadvise64			sys_fadvise64

233	spu	fadvise64			sys_fadvise64

234	nospu	exit_group			sys_exit_group

235	nospu	lookup_dcookie			sys_ni_syscall

236	common	epoll_create			sys_epoll_create
@@ -502,7 +506,7 @@ 
412	32	utimensat_time64		sys_utimensat			sys_utimensat

413	32	pselect6_time64			sys_pselect6			compat_sys_pselect6_time64

414	32	ppoll_time64			sys_ppoll			compat_sys_ppoll_time64

416	32	io_pgetevents_time64		sys_io_pgetevents		sys_io_pgetevents

416	32	io_pgetevents_time64		sys_io_pgetevents		compat_sys_io_pgetevents_time64

417	32	recvmmsg_time64			sys_recvmmsg			compat_sys_recvmmsg_time64

418	32	mq_timedsend_time64		sys_mq_timedsend		sys_mq_timedsend

419	32	mq_timedreceive_time64		sys_mq_timedreceive		sys_mq_timedreceive

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

+1 −1
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ 
412	32	utimensat_time64	-				sys_utimensat

413	32	pselect6_time64		-				compat_sys_pselect6_time64

414	32	ppoll_time64		-				compat_sys_ppoll_time64

416	32	io_pgetevents_time64	-				sys_io_pgetevents

416	32	io_pgetevents_time64	-				compat_sys_io_pgetevents_time64

417	32	recvmmsg_time64		-				compat_sys_recvmmsg_time64

418	32	mq_timedsend_time64	-				sys_mq_timedsend

419	32	mq_timedreceive_time64	-				sys_mq_timedreceive

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

+5 −3
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note

#

# 64-bit system call numbers and entry vectors

#

# The format is:

# <number> <abi> <name> <entry point>

# <number> <abi> <name> <entry point> [<compat entry point> [noreturn]]

#

# The __x64_sys_*() stubs are created on-the-fly for sys_*() system calls

#
@@ -68,7 +69,7 @@ 
57	common	fork			sys_fork

58	common	vfork			sys_vfork

59	64	execve			sys_execve

60	common	exit			sys_exit

60	common	exit			sys_exit			-			noreturn

61	common	wait4			sys_wait4

62	common	kill			sys_kill

63	common	uname			sys_newuname
@@ -239,7 +240,7 @@ 
228	common	clock_gettime		sys_clock_gettime

229	common	clock_getres		sys_clock_getres

230	common	clock_nanosleep		sys_clock_nanosleep

231	common	exit_group		sys_exit_group

231	common	exit_group		sys_exit_group			-			noreturn

232	common	epoll_wait		sys_epoll_wait

233	common	epoll_ctl		sys_epoll_ctl

234	common	tgkill			sys_tgkill
@@ -343,6 +344,7 @@ 
332	common	statx			sys_statx

333	common	io_pgetevents		sys_io_pgetevents

334	common	rseq			sys_rseq

335	common	uretprobe		sys_uretprobe

# don't use numbers 387 through 423, add new calls after the last

# 'common' entry

424	common	pidfd_send_signal	sys_pidfd_send_signal