To pick up the changes in: c4a16820d9019940 fs: add open_tree_attr() 2df1ad0d25803399 x86/arch_prctl: Simplify sys_arch_prctl() e632bca07c8eef1d arm64: generate 64-bit syscall.tbl This is basically to support the new open_tree_attr syscall. But it also needs to update asm-generic unistd.h header to get the new syscall number. And arm64 unistd.h header was converted to use the generic 64-bit header. Addressing this perf tools build warning: Warning: Kernel ABI header differences: diff -u tools/scripts/syscall.tbl scripts/syscall.tbl diff -u tools/perf/arch/x86/entry/syscalls/syscall_32.tbl arch/x86/entry/syscalls/syscall_32.tbl 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 diff -u tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl arch/mips/kernel/syscalls/syscall_n64.tbl diff -u tools/perf/arch/arm/entry/syscalls/syscall.tbl arch/arm/tools/syscall.tbl diff -u tools/perf/arch/sh/entry/syscalls/syscall.tbl arch/sh/kernel/syscalls/syscall.tbl diff -u tools/perf/arch/sparc/entry/syscalls/syscall.tbl arch/sparc/kernel/syscalls/syscall.tbl diff -u tools/perf/arch/xtensa/entry/syscalls/syscall.tbl arch/xtensa/kernel/syscalls/syscall.tbl diff -u tools/arch/arm64/include/uapi/asm/unistd.h arch/arm64/include/uapi/asm/unistd.h diff -u tools/include/uapi/asm-generic/unistd.h include/uapi/asm-generic/unistd.h Please see tools/include/uapi/README for further details.
Unified · Split
| @@ -1,24 +1,2 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ | 1 | /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ |
| 2 | /* | 2 | #include <asm/unistd_64.h> |
| 3 | * Copyright (C) 2012 ARM Ltd. | ||
| 4 | * | ||
| 5 | * This program is free software; you can redistribute it and/or modify | ||
| 6 | * it under the terms of the GNU General Public License version 2 as | ||
| 7 | * published by the Free Software Foundation. | ||
| 8 | * | ||
| 9 | * This program is distributed in the hope that it will be useful, | ||
| 10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 12 | * GNU General Public License for more details. | ||
| 13 | * | ||
| 14 | * You should have received a copy of the GNU General Public License | ||
| 15 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 16 | */ | ||
| 17 | |||
| 18 | #define __ARCH_WANT_RENAMEAT | ||
| 19 | #define __ARCH_WANT_NEW_STAT | ||
| 20 | #define __ARCH_WANT_SET_GET_RLIMIT | ||
| 21 | #define __ARCH_WANT_TIME32_SYSCALLS | ||
| 22 | #define __ARCH_WANT_MEMFD_SECRET | ||
| 23 | |||
| 24 | #include <asm-generic/unistd.h> | ||
| @@ -849,9 +849,11 @@ __SYSCALL(__NR_getxattrat, sys_getxattrat) · 848 unmodified lines | |||
| 849 | __SYSCALL(__NR_listxattrat, sys_listxattrat) | 849 | __SYSCALL(__NR_listxattrat, sys_listxattrat) |
| 850 | #define __NR_removexattrat 466 | 850 | #define __NR_removexattrat 466 |
| 851 | __SYSCALL(__NR_removexattrat, sys_removexattrat) | 851 | __SYSCALL(__NR_removexattrat, sys_removexattrat) |
| 852 | #define __NR_open_tree_attr 467 | ||
| 853 | __SYSCALL(__NR_open_tree_attr, sys_open_tree_attr) | ||
| 852 | 854 | ||
| 853 | #undef __NR_syscalls | 855 | #undef __NR_syscalls |
| 854 | #define __NR_syscalls 467 | 856 | #define __NR_syscalls 468 |
| 855 | 857 | ||
| 856 | /* | 858 | /* |
| 857 | * 32 bit systems traditionally used different | 859 | * 32 bit systems traditionally used different |
| @@ -481,3 +481,4 @@ · 480 unmodified lines | |||
| 481 | 464 common getxattrat sys_getxattrat | 481 | 464 common getxattrat sys_getxattrat |
| 482 | 465 common listxattrat sys_listxattrat | 482 | 465 common listxattrat sys_listxattrat |
| 483 | 466 common removexattrat sys_removexattrat | 483 | 466 common removexattrat sys_removexattrat |
| 484 | 467 common open_tree_attr sys_open_tree_attr | ||
| @@ -381,3 +381,4 @@ · 380 unmodified lines | |||
| 381 | 464 n64 getxattrat sys_getxattrat | 381 | 464 n64 getxattrat sys_getxattrat |
| 382 | 465 n64 listxattrat sys_listxattrat | 382 | 465 n64 listxattrat sys_listxattrat |
| 383 | 466 n64 removexattrat sys_removexattrat | 383 | 466 n64 removexattrat sys_removexattrat |
| 384 | 467 n64 open_tree_attr sys_open_tree_attr | ||
| @@ -557,3 +557,4 @@ · 556 unmodified lines | |||
| 557 | 464 common getxattrat sys_getxattrat | 557 | 464 common getxattrat sys_getxattrat |
| 558 | 465 common listxattrat sys_listxattrat | 558 | 465 common listxattrat sys_listxattrat |
| 559 | 466 common removexattrat sys_removexattrat | 559 | 466 common removexattrat sys_removexattrat |
| 560 | 467 common open_tree_attr sys_open_tree_attr | ||
| @@ -469,3 +469,4 @@ · 468 unmodified lines | |||
| 469 | 464 common getxattrat sys_getxattrat sys_getxattrat | 469 | 464 common getxattrat sys_getxattrat sys_getxattrat |
| 470 | 465 common listxattrat sys_listxattrat sys_listxattrat | 470 | 465 common listxattrat sys_listxattrat sys_listxattrat |
| 471 | 466 common removexattrat sys_removexattrat sys_removexattrat | 471 | 466 common removexattrat sys_removexattrat sys_removexattrat |
| 472 | 467 common open_tree_attr sys_open_tree_attr sys_open_tree_attr | ||
| @@ -470,3 +470,4 @@ · 469 unmodified lines | |||
| 470 | 464 common getxattrat sys_getxattrat | 470 | 464 common getxattrat sys_getxattrat |
| 471 | 465 common listxattrat sys_listxattrat | 471 | 465 common listxattrat sys_listxattrat |
| 472 | 466 common removexattrat sys_removexattrat | 472 | 466 common removexattrat sys_removexattrat |
| 473 | 467 common open_tree_attr sys_open_tree_attr | ||
| @@ -512,3 +512,4 @@ · 511 unmodified lines | |||
| 512 | 464 common getxattrat sys_getxattrat | 512 | 464 common getxattrat sys_getxattrat |
| 513 | 465 common listxattrat sys_listxattrat | 513 | 465 common listxattrat sys_listxattrat |
| 514 | 466 common removexattrat sys_removexattrat | 514 | 466 common removexattrat sys_removexattrat |
| 515 | 467 common open_tree_attr sys_open_tree_attr | ||
| @@ -396,7 +396,7 @@ · 395 unmodified lines | |||
| 396 | 381 i386 pkey_alloc sys_pkey_alloc | 396 | 381 i386 pkey_alloc sys_pkey_alloc |
| 397 | 382 i386 pkey_free sys_pkey_free | 397 | 382 i386 pkey_free sys_pkey_free |
| 398 | 383 i386 statx sys_statx | 398 | 383 i386 statx sys_statx |
| 399 | 384 i386 arch_prctl sys_arch_prctl compat_sys_arch_prctl | 399 | 384 i386 arch_prctl sys_arch_prctl |
| 400 | 385 i386 io_pgetevents sys_io_pgetevents_time32 compat_sys_io_pgetevents | 400 | 385 i386 io_pgetevents sys_io_pgetevents_time32 compat_sys_io_pgetevents |
| 401 | 386 i386 rseq sys_rseq | 401 | 386 i386 rseq sys_rseq |
| 402 | 393 i386 semget sys_semget | 402 | 393 i386 semget sys_semget |
| @@ -472,3 +472,4 @@ · 69 unmodified lines | |||
| 472 | 464 i386 getxattrat sys_getxattrat | 472 | 464 i386 getxattrat sys_getxattrat |
| 473 | 465 i386 listxattrat sys_listxattrat | 473 | 465 i386 listxattrat sys_listxattrat |
| 474 | 466 i386 removexattrat sys_removexattrat | 474 | 466 i386 removexattrat sys_removexattrat |
| 475 | 467 i386 open_tree_attr sys_open_tree_attr | ||
| @@ -390,6 +390,7 @@ · 389 unmodified lines | |||
| 390 | 464 common getxattrat sys_getxattrat | 390 | 464 common getxattrat sys_getxattrat |
| 391 | 465 common listxattrat sys_listxattrat | 391 | 465 common listxattrat sys_listxattrat |
| 392 | 466 common removexattrat sys_removexattrat | 392 | 466 common removexattrat sys_removexattrat |
| 393 | 467 common open_tree_attr sys_open_tree_attr | ||
| 393 | 394 | ||
| 394 | # | 395 | # |
| 395 | # Due to a historical design error, certain syscalls are numbered differently | 396 | # Due to a historical design error, certain syscalls are numbered differently |
| @@ -437,3 +437,4 @@ · 436 unmodified lines | |||
| 437 | 464 common getxattrat sys_getxattrat | 437 | 464 common getxattrat sys_getxattrat |
| 438 | 465 common listxattrat sys_listxattrat | 438 | 465 common listxattrat sys_listxattrat |
| 439 | 466 common removexattrat sys_removexattrat | 439 | 466 common removexattrat sys_removexattrat |
| 440 | 467 common open_tree_attr sys_open_tree_attr | ||
| @@ -407,3 +407,4 @@ · 406 unmodified lines | |||
| 407 | 464 common getxattrat sys_getxattrat | 407 | 464 common getxattrat sys_getxattrat |
| 408 | 465 common listxattrat sys_listxattrat | 408 | 465 common listxattrat sys_listxattrat |
| 409 | 466 common removexattrat sys_removexattrat | 409 | 466 common removexattrat sys_removexattrat |
| 410 | 467 common open_tree_attr sys_open_tree_attr | ||