diff options
| author | Huacai Chen <chenhuacai@loongson.cn> | 2024-07-17 17:07:11 +0800 |
|---|---|---|
| committer | Huacai Chen <chenhuacai@loongson.cn> | 2024-07-17 17:07:11 +0800 |
| commit | 256a6f430562c163f1fa07576c4cd4e996e953dd (patch) | |
| tree | 530ce6034bc9c99bb95661b34131db8faf928089 /tools | |
| parent | 0c3836482481200ead7b416ca80c68a29cfdaabd (diff) | |
| parent | 1a7b7326d587c9a5e8ff067e70d6aaf0333f4bb3 (diff) | |
| download | linux-256a6f430562c163f1fa07576c4cd4e996e953dd.tar.gz linux-256a6f430562c163f1fa07576c4cd4e996e953dd.zip | |
Merge tag 'asm-generic-6.11' into loongarch-next
LoongArch architecture changes for 6.11 depend on the asm-generic
changes to avoid confliction, so merge them to create a base.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/arch/arm64/include/uapi/asm/unistd.h | 1 | ||||
| -rw-r--r-- | tools/arch/loongarch/include/uapi/asm/unistd.h | 1 | ||||
| -rw-r--r-- | tools/include/uapi/asm-generic/unistd.h | 4 |
3 files changed, 0 insertions, 6 deletions
diff --git a/tools/arch/arm64/include/uapi/asm/unistd.h b/tools/arch/arm64/include/uapi/asm/unistd.h index ce2ee8f1e361..9306726337fe 100644 --- a/tools/arch/arm64/include/uapi/asm/unistd.h +++ b/tools/arch/arm64/include/uapi/asm/unistd.h @@ -19,7 +19,6 @@ #define __ARCH_WANT_NEW_STAT #define __ARCH_WANT_SET_GET_RLIMIT #define __ARCH_WANT_TIME32_SYSCALLS -#define __ARCH_WANT_SYS_CLONE3 #define __ARCH_WANT_MEMFD_SECRET #include <asm-generic/unistd.h> diff --git a/tools/arch/loongarch/include/uapi/asm/unistd.h b/tools/arch/loongarch/include/uapi/asm/unistd.h index 0c743344e92d..8eeaac0087c3 100644 --- a/tools/arch/loongarch/include/uapi/asm/unistd.h +++ b/tools/arch/loongarch/include/uapi/asm/unistd.h @@ -4,6 +4,5 @@ */ #define __ARCH_WANT_SYS_CLONE -#define __ARCH_WANT_SYS_CLONE3 #include <asm-generic/unistd.h> diff --git a/tools/include/uapi/asm-generic/unistd.h b/tools/include/uapi/asm-generic/unistd.h index d983c48a3b6a..a00d53d02723 100644 --- a/tools/include/uapi/asm-generic/unistd.h +++ b/tools/include/uapi/asm-generic/unistd.h @@ -776,12 +776,8 @@ __SYSCALL(__NR_fsmount, sys_fsmount) __SYSCALL(__NR_fspick, sys_fspick) #define __NR_pidfd_open 434 __SYSCALL(__NR_pidfd_open, sys_pidfd_open) - -#ifdef __ARCH_WANT_SYS_CLONE3 #define __NR_clone3 435 __SYSCALL(__NR_clone3, sys_clone3) -#endif - #define __NR_close_range 436 __SYSCALL(__NR_close_range, sys_close_range) #define __NR_openat2 437 |