[PATCH openEuler-5.10 1/3] perf tools: Update powerpc's syscall.tbl copy from the kernel sources
From: Tiezhu Yang yangtiezhu@loongson.cn
mainline inclusion from mainline-v5.11-rc1 commit c5ef52944a2d category: bugfix bugzilla: 186175, https://gitee.com/openeuler/kernel/issues/I4S77Z CVE: NA
-------------------------------------------------
This silences the following tools/perf/ build warning:
Warning: Kernel ABI header at 'tools/perf/arch/powerpc/entry/syscalls/syscall.tbl' differs from latest version at 'arch/powerpc/kernel/syscalls/syscall.tbl'
Just make them same:
cp arch/powerpc/kernel/syscalls/syscall.tbl tools/perf/arch/powerpc/entry/syscalls/syscall.tbl
Signed-off-by: Tiezhu Yang yangtiezhu@loongson.cn Reviewed-by: Naveen N. Rao naveen.n.rao@linux.vnet.ibm.com Cc: Alexander Shishkin alexander.shishkin@linux.intel.com Cc: Ingo Molnar mingo@redhat.com Cc: Jiri Olsa jolsa@redhat.com Cc: Mark Rutland mark.rutland@arm.com Cc: Namhyung Kim namhyung@kernel.org Cc: Peter Zijlstra peterz@infradead.org Cc: Xuefeng Li lixuefeng@loongson.cn Link: http://lore.kernel.org/lkml/1608278364-6733-4-git-send-email-yangtiezhu@loon... [ There were updates after Tiezhu's post, so I just updated the copy ] Signed-off-by: Arnaldo Carvalho de Melo acme@redhat.com [liwei391@huawei.com: remove 441] Signed-off-by: Wei Li liwei391@huawei.com Reviewed-by: Cheng Jian cj.chengjian@huawei.com Signed-off-by: Zheng Zengkai zhengzengkai@huawei.com --- .../arch/powerpc/entry/syscalls/syscall.tbl | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl b/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl index b168364ac050..1275daec7fec 100644 --- a/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl +++ b/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl @@ -9,7 +9,9 @@ # 0 nospu restart_syscall sys_restart_syscall 1 nospu exit sys_exit -2 nospu fork ppc_fork +2 32 fork ppc_fork sys_fork +2 64 fork sys_fork +2 spu fork sys_ni_syscall 3 common read sys_read 4 common write sys_write 5 common open sys_open compat_sys_open @@ -158,7 +160,9 @@ 119 32 sigreturn sys_sigreturn compat_sys_sigreturn 119 64 sigreturn sys_ni_syscall 119 spu sigreturn sys_ni_syscall -120 nospu clone ppc_clone +120 32 clone ppc_clone sys_clone +120 64 clone sys_clone +120 spu clone sys_ni_syscall 121 common setdomainname sys_setdomainname 122 common uname sys_newuname 123 common modify_ldt sys_ni_syscall @@ -240,7 +244,9 @@ 186 spu sendfile sys_sendfile64 187 common getpmsg sys_ni_syscall 188 common putpmsg sys_ni_syscall -189 nospu vfork ppc_vfork +189 32 vfork ppc_vfork sys_vfork +189 64 vfork sys_vfork +189 spu vfork sys_ni_syscall 190 common ugetrlimit sys_getrlimit compat_sys_getrlimit 191 common readahead sys_readahead compat_sys_readahead 192 32 mmap2 sys_mmap2 compat_sys_mmap2 @@ -316,8 +322,8 @@ 248 32 clock_nanosleep sys_clock_nanosleep_time32 248 64 clock_nanosleep sys_clock_nanosleep 248 spu clock_nanosleep sys_clock_nanosleep -249 32 swapcontext ppc_swapcontext ppc32_swapcontext -249 64 swapcontext ppc64_swapcontext +249 32 swapcontext ppc_swapcontext compat_sys_swapcontext +249 64 swapcontext sys_swapcontext 249 spu swapcontext sys_ni_syscall 250 common tgkill sys_tgkill 251 32 utimes sys_utimes_time32 @@ -456,7 +462,7 @@ 361 common bpf sys_bpf 362 nospu execveat sys_execveat compat_sys_execveat 363 32 switch_endian sys_ni_syscall -363 64 switch_endian ppc_switch_endian +363 64 switch_endian sys_switch_endian 363 spu switch_endian sys_ni_syscall 364 common userfaultfd sys_userfaultfd 365 common membarrier sys_membarrier @@ -516,6 +522,11 @@ 432 common fsmount sys_fsmount 433 common fspick sys_fspick 434 common pidfd_open sys_pidfd_open -435 nospu clone3 ppc_clone3 +435 32 clone3 ppc_clone3 sys_clone3 +435 64 clone3 sys_clone3 +435 spu clone3 sys_ni_syscall +436 common close_range sys_close_range 437 common openat2 sys_openat2 438 common pidfd_getfd sys_pidfd_getfd +439 common faccessat2 sys_faccessat2 +440 common process_madvise sys_process_madvise
From: Wei Li liwei391@huawei.com
hulk inclusion category: feature bugzilla: 186175, https://gitee.com/openeuler/kernel/issues/I4S77Z CVE: NA
-------------------------------------------------
Reserve several syscall entries for kabi compatibility. For arch arm32,ppc32,riscv64,ppc64,arm64,x86_64 currently.
Signed-off-by: Wei Li liwei391@huawei.com Reviewed-by: Cheng Jian cj.chengjian@huawei.com Signed-off-by: Zheng Zengkai zhengzengkai@huawei.com --- arch/arm/tools/syscall.tbl | 16 +++++++++ arch/arm64/include/asm/unistd.h | 2 +- arch/arm64/include/asm/unistd32.h | 33 +++++++++++++++++ arch/powerpc/kernel/syscalls/syscall.tbl | 16 +++++++++ arch/x86/entry/syscalls/syscall_32.tbl | 16 +++++++++ arch/x86/entry/syscalls/syscall_64.tbl | 16 +++++++++ include/uapi/asm-generic/unistd.h | 35 ++++++++++++++++++- tools/include/uapi/asm-generic/unistd.h | 35 ++++++++++++++++++- .../arch/powerpc/entry/syscalls/syscall.tbl | 16 +++++++++ .../arch/x86/entry/syscalls/syscall_64.tbl | 16 +++++++++ 10 files changed, 198 insertions(+), 3 deletions(-)
diff --git a/arch/arm/tools/syscall.tbl b/arch/arm/tools/syscall.tbl index d056a548358e..7a06fde65e1f 100644 --- a/arch/arm/tools/syscall.tbl +++ b/arch/arm/tools/syscall.tbl @@ -454,3 +454,19 @@ 438 common pidfd_getfd sys_pidfd_getfd 439 common faccessat2 sys_faccessat2 440 common process_madvise sys_process_madvise +441 common kabi_reserved441 sys_ni_syscall +442 common kabi_reserved442 sys_ni_syscall +443 common kabi_reserved443 sys_ni_syscall +444 common kabi_reserved444 sys_ni_syscall +445 common kabi_reserved445 sys_ni_syscall +446 common kabi_reserved446 sys_ni_syscall +447 common kabi_reserved447 sys_ni_syscall +448 common kabi_reserved448 sys_ni_syscall +449 common kabi_reserved449 sys_ni_syscall +450 common kabi_reserved450 sys_ni_syscall +451 common kabi_reserved451 sys_ni_syscall +452 common kabi_reserved452 sys_ni_syscall +453 common kabi_reserved453 sys_ni_syscall +454 common kabi_reserved454 sys_ni_syscall +455 common kabi_reserved455 sys_ni_syscall +456 common kabi_reserved456 sys_ni_syscall diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h index 8db0b0df3dd4..39ce73c8084d 100644 --- a/arch/arm64/include/asm/unistd.h +++ b/arch/arm64/include/asm/unistd.h @@ -43,7 +43,7 @@ #define __ARM_NR_compat_set_tls (__ARM_NR_COMPAT_BASE + 5) #define __ARM_NR_COMPAT_END (__ARM_NR_COMPAT_BASE + 0x800)
-#define __NR_compat_syscalls 441 +#define __NR_compat_syscalls 457 #endif
#define __ARCH_WANT_SYS_CLONE diff --git a/arch/arm64/include/asm/unistd32.h b/arch/arm64/include/asm/unistd32.h index 107f08e03b9f..6eb1c2c6958f 100644 --- a/arch/arm64/include/asm/unistd32.h +++ b/arch/arm64/include/asm/unistd32.h @@ -890,6 +890,39 @@ __SYSCALL(__NR_faccessat2, sys_faccessat2) #define __NR_process_madvise 440 __SYSCALL(__NR_process_madvise, sys_process_madvise)
+#define __NR_kabi_reserved441 441 +__SYSCALL(__NR_kabi_reserved441, sys_ni_syscall) +#define __NR_kabi_reserved442 442 +__SYSCALL(__NR_kabi_reserved442, sys_ni_syscall) +#define __NR_kabi_reserved443 443 +__SYSCALL(__NR_kabi_reserved443, sys_ni_syscall) +#define __NR_kabi_reserved444 444 +__SYSCALL(__NR_kabi_reserved444, sys_ni_syscall) +#define __NR_kabi_reserved445 445 +__SYSCALL(__NR_kabi_reserved445, sys_ni_syscall) +#define __NR_kabi_reserved446 446 +__SYSCALL(__NR_kabi_reserved446, sys_ni_syscall) +#define __NR_kabi_reserved447 447 +__SYSCALL(__NR_kabi_reserved447, sys_ni_syscall) +#define __NR_kabi_reserved448 448 +__SYSCALL(__NR_kabi_reserved448, sys_ni_syscall) +#define __NR_kabi_reserved449 449 +__SYSCALL(__NR_kabi_reserved449, sys_ni_syscall) +#define __NR_kabi_reserved450 450 +__SYSCALL(__NR_kabi_reserved450, sys_ni_syscall) +#define __NR_kabi_reserved451 451 +__SYSCALL(__NR_kabi_reserved451, sys_ni_syscall) +#define __NR_kabi_reserved452 452 +__SYSCALL(__NR_kabi_reserved452, sys_ni_syscall) +#define __NR_kabi_reserved453 453 +__SYSCALL(__NR_kabi_reserved453, sys_ni_syscall) +#define __NR_kabi_reserved454 454 +__SYSCALL(__NR_kabi_reserved454, sys_ni_syscall) +#define __NR_kabi_reserved455 455 +__SYSCALL(__NR_kabi_reserved455, sys_ni_syscall) +#define __NR_kabi_reserved456 456 +__SYSCALL(__NR_kabi_reserved456, sys_ni_syscall) + /* * Please add new compat syscalls above this comment and update * __NR_compat_syscalls in asm/unistd.h. diff --git a/arch/powerpc/kernel/syscalls/syscall.tbl b/arch/powerpc/kernel/syscalls/syscall.tbl index 1275daec7fec..c68c1111c155 100644 --- a/arch/powerpc/kernel/syscalls/syscall.tbl +++ b/arch/powerpc/kernel/syscalls/syscall.tbl @@ -530,3 +530,19 @@ 438 common pidfd_getfd sys_pidfd_getfd 439 common faccessat2 sys_faccessat2 440 common process_madvise sys_process_madvise +441 common kabi_reserved441 sys_ni_syscall +442 common kabi_reserved442 sys_ni_syscall +443 common kabi_reserved443 sys_ni_syscall +444 common kabi_reserved444 sys_ni_syscall +445 common kabi_reserved445 sys_ni_syscall +446 common kabi_reserved446 sys_ni_syscall +447 common kabi_reserved447 sys_ni_syscall +448 common kabi_reserved448 sys_ni_syscall +449 common kabi_reserved449 sys_ni_syscall +450 common kabi_reserved450 sys_ni_syscall +451 common kabi_reserved451 sys_ni_syscall +452 common kabi_reserved452 sys_ni_syscall +453 common kabi_reserved453 sys_ni_syscall +454 common kabi_reserved454 sys_ni_syscall +455 common kabi_reserved455 sys_ni_syscall +456 common kabi_reserved456 sys_ni_syscall diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl index 0d0667a9fbd7..7c7fc88afae8 100644 --- a/arch/x86/entry/syscalls/syscall_32.tbl +++ b/arch/x86/entry/syscalls/syscall_32.tbl @@ -445,3 +445,19 @@ 438 i386 pidfd_getfd sys_pidfd_getfd 439 i386 faccessat2 sys_faccessat2 440 i386 process_madvise sys_process_madvise +441 i386 kabi_reserved441 sys_ni_syscall +442 i386 kabi_reserved442 sys_ni_syscall +443 i386 kabi_reserved443 sys_ni_syscall +444 i386 kabi_reserved444 sys_ni_syscall +445 i386 kabi_reserved445 sys_ni_syscall +446 i386 kabi_reserved446 sys_ni_syscall +447 i386 kabi_reserved447 sys_ni_syscall +448 i386 kabi_reserved448 sys_ni_syscall +449 i386 kabi_reserved449 sys_ni_syscall +450 i386 kabi_reserved450 sys_ni_syscall +451 i386 kabi_reserved451 sys_ni_syscall +452 i386 kabi_reserved452 sys_ni_syscall +453 i386 kabi_reserved453 sys_ni_syscall +454 i386 kabi_reserved454 sys_ni_syscall +455 i386 kabi_reserved455 sys_ni_syscall +456 i386 kabi_reserved456 sys_ni_syscall diff --git a/arch/x86/entry/syscalls/syscall_64.tbl b/arch/x86/entry/syscalls/syscall_64.tbl index 379819244b91..8f4ad1695d8f 100644 --- a/arch/x86/entry/syscalls/syscall_64.tbl +++ b/arch/x86/entry/syscalls/syscall_64.tbl @@ -362,6 +362,22 @@ 438 common pidfd_getfd sys_pidfd_getfd 439 common faccessat2 sys_faccessat2 440 common process_madvise sys_process_madvise +441 common kabi_reserved441 sys_ni_syscall +442 common kabi_reserved442 sys_ni_syscall +443 common kabi_reserved443 sys_ni_syscall +444 common kabi_reserved444 sys_ni_syscall +445 common kabi_reserved445 sys_ni_syscall +446 common kabi_reserved446 sys_ni_syscall +447 common kabi_reserved447 sys_ni_syscall +448 common kabi_reserved448 sys_ni_syscall +449 common kabi_reserved449 sys_ni_syscall +450 common kabi_reserved450 sys_ni_syscall +451 common kabi_reserved451 sys_ni_syscall +452 common kabi_reserved452 sys_ni_syscall +453 common kabi_reserved453 sys_ni_syscall +454 common kabi_reserved454 sys_ni_syscall +455 common kabi_reserved455 sys_ni_syscall +456 common kabi_reserved456 sys_ni_syscall
# # Due to a historical design error, certain syscalls are numbered differently diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h index 2056318988f7..ddd5d28b5b7f 100644 --- a/include/uapi/asm-generic/unistd.h +++ b/include/uapi/asm-generic/unistd.h @@ -860,8 +860,41 @@ __SYSCALL(__NR_faccessat2, sys_faccessat2) #define __NR_process_madvise 440 __SYSCALL(__NR_process_madvise, sys_process_madvise)
+#define __NR_kabi_reserved441 441 +__SYSCALL(__NR_kabi_reserved441, sys_ni_syscall) +#define __NR_kabi_reserved442 442 +__SYSCALL(__NR_kabi_reserved442, sys_ni_syscall) +#define __NR_kabi_reserved443 443 +__SYSCALL(__NR_kabi_reserved443, sys_ni_syscall) +#define __NR_kabi_reserved444 444 +__SYSCALL(__NR_kabi_reserved444, sys_ni_syscall) +#define __NR_kabi_reserved445 445 +__SYSCALL(__NR_kabi_reserved445, sys_ni_syscall) +#define __NR_kabi_reserved446 446 +__SYSCALL(__NR_kabi_reserved446, sys_ni_syscall) +#define __NR_kabi_reserved447 447 +__SYSCALL(__NR_kabi_reserved447, sys_ni_syscall) +#define __NR_kabi_reserved448 448 +__SYSCALL(__NR_kabi_reserved448, sys_ni_syscall) +#define __NR_kabi_reserved449 449 +__SYSCALL(__NR_kabi_reserved449, sys_ni_syscall) +#define __NR_kabi_reserved450 450 +__SYSCALL(__NR_kabi_reserved450, sys_ni_syscall) +#define __NR_kabi_reserved451 451 +__SYSCALL(__NR_kabi_reserved451, sys_ni_syscall) +#define __NR_kabi_reserved452 452 +__SYSCALL(__NR_kabi_reserved452, sys_ni_syscall) +#define __NR_kabi_reserved453 453 +__SYSCALL(__NR_kabi_reserved453, sys_ni_syscall) +#define __NR_kabi_reserved454 454 +__SYSCALL(__NR_kabi_reserved454, sys_ni_syscall) +#define __NR_kabi_reserved455 455 +__SYSCALL(__NR_kabi_reserved455, sys_ni_syscall) +#define __NR_kabi_reserved456 456 +__SYSCALL(__NR_kabi_reserved456, sys_ni_syscall) + #undef __NR_syscalls -#define __NR_syscalls 441 +#define __NR_syscalls 457
/* * 32 bit systems traditionally used different diff --git a/tools/include/uapi/asm-generic/unistd.h b/tools/include/uapi/asm-generic/unistd.h index 2056318988f7..ddd5d28b5b7f 100644 --- a/tools/include/uapi/asm-generic/unistd.h +++ b/tools/include/uapi/asm-generic/unistd.h @@ -860,8 +860,41 @@ __SYSCALL(__NR_faccessat2, sys_faccessat2) #define __NR_process_madvise 440 __SYSCALL(__NR_process_madvise, sys_process_madvise)
+#define __NR_kabi_reserved441 441 +__SYSCALL(__NR_kabi_reserved441, sys_ni_syscall) +#define __NR_kabi_reserved442 442 +__SYSCALL(__NR_kabi_reserved442, sys_ni_syscall) +#define __NR_kabi_reserved443 443 +__SYSCALL(__NR_kabi_reserved443, sys_ni_syscall) +#define __NR_kabi_reserved444 444 +__SYSCALL(__NR_kabi_reserved444, sys_ni_syscall) +#define __NR_kabi_reserved445 445 +__SYSCALL(__NR_kabi_reserved445, sys_ni_syscall) +#define __NR_kabi_reserved446 446 +__SYSCALL(__NR_kabi_reserved446, sys_ni_syscall) +#define __NR_kabi_reserved447 447 +__SYSCALL(__NR_kabi_reserved447, sys_ni_syscall) +#define __NR_kabi_reserved448 448 +__SYSCALL(__NR_kabi_reserved448, sys_ni_syscall) +#define __NR_kabi_reserved449 449 +__SYSCALL(__NR_kabi_reserved449, sys_ni_syscall) +#define __NR_kabi_reserved450 450 +__SYSCALL(__NR_kabi_reserved450, sys_ni_syscall) +#define __NR_kabi_reserved451 451 +__SYSCALL(__NR_kabi_reserved451, sys_ni_syscall) +#define __NR_kabi_reserved452 452 +__SYSCALL(__NR_kabi_reserved452, sys_ni_syscall) +#define __NR_kabi_reserved453 453 +__SYSCALL(__NR_kabi_reserved453, sys_ni_syscall) +#define __NR_kabi_reserved454 454 +__SYSCALL(__NR_kabi_reserved454, sys_ni_syscall) +#define __NR_kabi_reserved455 455 +__SYSCALL(__NR_kabi_reserved455, sys_ni_syscall) +#define __NR_kabi_reserved456 456 +__SYSCALL(__NR_kabi_reserved456, sys_ni_syscall) + #undef __NR_syscalls -#define __NR_syscalls 441 +#define __NR_syscalls 457
/* * 32 bit systems traditionally used different diff --git a/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl b/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl index 1275daec7fec..c68c1111c155 100644 --- a/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl +++ b/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl @@ -530,3 +530,19 @@ 438 common pidfd_getfd sys_pidfd_getfd 439 common faccessat2 sys_faccessat2 440 common process_madvise sys_process_madvise +441 common kabi_reserved441 sys_ni_syscall +442 common kabi_reserved442 sys_ni_syscall +443 common kabi_reserved443 sys_ni_syscall +444 common kabi_reserved444 sys_ni_syscall +445 common kabi_reserved445 sys_ni_syscall +446 common kabi_reserved446 sys_ni_syscall +447 common kabi_reserved447 sys_ni_syscall +448 common kabi_reserved448 sys_ni_syscall +449 common kabi_reserved449 sys_ni_syscall +450 common kabi_reserved450 sys_ni_syscall +451 common kabi_reserved451 sys_ni_syscall +452 common kabi_reserved452 sys_ni_syscall +453 common kabi_reserved453 sys_ni_syscall +454 common kabi_reserved454 sys_ni_syscall +455 common kabi_reserved455 sys_ni_syscall +456 common kabi_reserved456 sys_ni_syscall diff --git a/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl b/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl index 379819244b91..8f4ad1695d8f 100644 --- a/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl +++ b/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl @@ -362,6 +362,22 @@ 438 common pidfd_getfd sys_pidfd_getfd 439 common faccessat2 sys_faccessat2 440 common process_madvise sys_process_madvise +441 common kabi_reserved441 sys_ni_syscall +442 common kabi_reserved442 sys_ni_syscall +443 common kabi_reserved443 sys_ni_syscall +444 common kabi_reserved444 sys_ni_syscall +445 common kabi_reserved445 sys_ni_syscall +446 common kabi_reserved446 sys_ni_syscall +447 common kabi_reserved447 sys_ni_syscall +448 common kabi_reserved448 sys_ni_syscall +449 common kabi_reserved449 sys_ni_syscall +450 common kabi_reserved450 sys_ni_syscall +451 common kabi_reserved451 sys_ni_syscall +452 common kabi_reserved452 sys_ni_syscall +453 common kabi_reserved453 sys_ni_syscall +454 common kabi_reserved454 sys_ni_syscall +455 common kabi_reserved455 sys_ni_syscall +456 common kabi_reserved456 sys_ni_syscall
# # Due to a historical design error, certain syscalls are numbered differently
From: Guan Jing guanjing6@huawei.com
hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4KAP1?from=project-issue CVE: NA
-------------------------------
We reserve some fields beforehand for thread_info prone to change.
Signed-off-by: Guan Jing guanjing6@huawei.com Reviewed-by: Chen Hui judy.chenhui@huawei.com Signed-off-by: Zheng Zengkai zhengzengkai@huawei.com --- arch/arm/include/asm/thread_info.h | 3 +++ arch/arm64/include/asm/thread_info.h | 4 ++++ arch/x86/include/asm/thread_info.h | 3 +++ 3 files changed, 10 insertions(+)
diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h index 2e4733a2e737..9f7ca79cc76a 100644 --- a/arch/arm/include/asm/thread_info.h +++ b/arch/arm/include/asm/thread_info.h @@ -12,6 +12,7 @@ #include <linux/compiler.h> #include <asm/fpstate.h> #include <asm/page.h> +#include <linux/kabi.h>
#ifdef CONFIG_KASAN /* @@ -73,6 +74,8 @@ struct thread_info { #ifdef CONFIG_ARM_THUMBEE unsigned long thumbee_state; /* ThumbEE Handler Base register */ #endif + KABI_RESERVE(1) + KABI_RESERVE(2) };
#define INIT_THREAD_INFO(tsk) \ diff --git a/arch/arm64/include/asm/thread_info.h b/arch/arm64/include/asm/thread_info.h index c826ad282dc9..6dba5059aa60 100644 --- a/arch/arm64/include/asm/thread_info.h +++ b/arch/arm64/include/asm/thread_info.h @@ -17,6 +17,7 @@ struct task_struct; #include <asm/memory.h> #include <asm/stack_pointer.h> #include <asm/types.h> +#include <linux/kabi.h>
typedef unsigned long mm_segment_t;
@@ -46,6 +47,9 @@ struct thread_info { void *scs_sp; #endif u32 cpu; + + KABI_RESERVE(1) + KABI_RESERVE(2) };
#define thread_saved_pc(tsk) \ diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h index 7a931f95e1ce..a225c6e2ca6d 100644 --- a/arch/x86/include/asm/thread_info.h +++ b/arch/x86/include/asm/thread_info.h @@ -12,6 +12,7 @@ #include <asm/page.h> #include <asm/percpu.h> #include <asm/types.h> +#include <linux/kabi.h>
/* * TOP_OF_KERNEL_STACK_PADDING is a number of unused bytes that we @@ -59,6 +60,8 @@ struct thread_info { #ifdef CONFIG_SMP u32 cpu; /* current CPU */ #endif + KABI_RESERVE(1) + KABI_RESERVE(2) };
#define INIT_THREAD_INFO(tsk) \
-
Zheng Zengkai