tools arch uapi: Update asm-generic/unistd.h and arm64 unistd.h copies

tip:perf/urgent tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Oct 31, 2018

Share & tools

tip-bot for Arnaldo Carvalho de Melo

author merge bot

2018-10-31 22:06 UTC #0 lore raw

Commit-ID:  8dd4c0f68c0db4c0f01af60a99a7ed34fd3dee2b
Gitweb:     https://git.kernel.org/tip/8dd4c0f68c0db4c0f01af60a99a7ed34fd3dee2b
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Tue, 30 Oct 2018 13:10:50 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Wed, 31 Oct 2018 09:57:51 -0300

tools arch uapi: Update asm-generic/unistd.h and arm64 unistd.h copies

To get the changes in:

82b355d161c9 ("y2038: Remove newstat family from default syscall set")

Which will make the syscall table used by 'perf trace' for arm64 to be updated from the changes in that patch.

This silences these perf build warnings:

Warning: Kernel ABI header at 'tools/arch/arm64/include/uapi/asm/unistd.h' differs from latest version at 'arch/arm64/include/uapi/asm/unistd.h' diff -u tools/arch/arm64/include/uapi/asm/unistd.h arch/arm64/include/uapi/asm/unistd.h
Warning: Kernel ABI header at 'tools/include/uapi/asm-generic/unistd.h' differs from latest version at 'include/uapi/asm-generic/unistd.h' diff -u tools/include/uapi/asm-generic/unistd.h include/uapi/asm-generic/unistd.h

Cc Kim Phillips <[email protected]>

Cc Arnd Bergmann <[email protected]>

Cc Geert Uytterhoeven <[email protected]>

Cc Jiri Olsa <[email protected]>

Cc Namhyung Kim <[email protected]>

Link https://lkml.kernel.org/n/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/arch/arm64/include/uapi/asm/unistd.h | 1 +
 tools/include/uapi/asm-generic/unistd.h    | 2 ++
 2 files changed, 3 insertions(+)

tools/arch/arm64/include/uapi/asm/unistd.h +1 -0

index 5072cbd15c82..dae1584cf017 100644
@@ -16,5 +16,6 @@
  */
 
 #define __ARCH_WANT_RENAMEAT
+#define __ARCH_WANT_NEW_STAT
 
 #include <asm-generic/unistd.h>

tools/include/uapi/asm-generic/unistd.h +2 -0

index df4bedb9b01c..538546edbfbd 100644
@@ -242,10 +242,12 @@ __SYSCALL(__NR_tee, sys_tee)
 /* fs/stat.c */
 #define __NR_readlinkat 78
 __SYSCALL(__NR_readlinkat, sys_readlinkat)
+#if defined(__ARCH_WANT_NEW_STAT) || defined(__ARCH_WANT_STAT64)
 #define __NR3264_fstatat 79
 __SC_3264(__NR3264_fstatat, sys_fstatat64, sys_newfstatat)
 #define __NR3264_fstat 80
 __SC_3264(__NR3264_fstat, sys_fstat64, sys_newfstat)
+#endif
 
 /* fs/sync.c */
 #define __NR_sync 81