[PATCH OLK-6.6 0/4] reserve space for arm64 related structures.
Reserve space for arm64 related structures. Include efi.h, extable.h, fb.h, processor.h Jinjie Ruan (4): kabi: reserve space for efi.h kabi: reserve space for extable.h kabi: reserve space for fb.h kabi: reserve space for processor.h arch/arm64/include/asm/extable.h | 3 +++ arch/arm64/include/asm/processor.h | 9 +++++++++ include/linux/efi.h | 3 +++ include/linux/fb.h | 7 +++++++ 4 files changed, 22 insertions(+) -- 2.34.1
hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8X87C -------------------------------- reserve space for efi.h Signed-off-by: Yuntao Liu <liuyuntao12@huawei.com> --- include/linux/efi.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/linux/efi.h b/include/linux/efi.h index 80b21d1c6eaf..4e89a4aac75a 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -26,6 +26,7 @@ #include <linux/uuid.h> #include <asm/page.h> +#include <linux/kabi.h> struct screen_info; @@ -669,6 +670,8 @@ extern struct efi { struct efi_memory_map memmap; unsigned long flags; + KABI_RESERVE(1) + KABI_RESERVE(2) } efi; #define EFI_RT_SUPPORTED_GET_TIME 0x0001 -- 2.34.1
hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8X87C -------------------------------- reserve space for extable.h Signed-off-by: Yuntao Liu <liuyuntao12@huawei.com> --- arch/arm64/include/asm/extable.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm64/include/asm/extable.h b/arch/arm64/include/asm/extable.h index f80ebd0addfd..5355382bf80a 100644 --- a/arch/arm64/include/asm/extable.h +++ b/arch/arm64/include/asm/extable.h @@ -2,6 +2,7 @@ #ifndef __ASM_EXTABLE_H #define __ASM_EXTABLE_H +#include <linux/kabi.h> /* * The exception table consists of pairs of relative offsets: the first * is the relative offset to an instruction that is allowed to fault, @@ -19,6 +20,8 @@ struct exception_table_entry { int insn, fixup; short type, data; + KABI_RESERVE(1) + KABI_RESERVE(2) }; #define ARCH_HAS_RELATIVE_EXTABLE -- 2.34.1
hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8X87C -------------------------------- reserve space for fb.h Signed-off-by: Yuntao Liu <liuyuntao12@huawei.com> --- include/linux/fb.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/linux/fb.h b/include/linux/fb.h index c14576458228..ab2a9f4163c7 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -17,6 +17,7 @@ #include <linux/slab.h> #include <asm/fb.h> +#include <linux/kabi.h> struct vm_area_struct; struct fb_info; @@ -218,6 +219,8 @@ struct fb_deferred_io { struct list_head pagereflist; /* list of pagerefs for touched pages */ /* callback */ void (*deferred_io)(struct fb_info *info, struct list_head *pagelist); + KABI_RESERVE(1) + KABI_RESERVE(2) }; #endif @@ -501,6 +504,10 @@ struct fb_info { void *par; bool skip_vt_switch; /* no VT switch on suspend/resume required */ + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) }; /* This will go away -- 2.34.1
From: Jinjie Ruan <ruanjinjie@huawei.com> hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8X87C -------------------------------- reserve space for processor.h Signed-off-by: Yuntao Liu <liuyuntao12@huawei.com> --- arch/arm64/include/asm/processor.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h index 44cada63ed08..9e688b1b13d4 100644 --- a/arch/arm64/include/asm/processor.h +++ b/arch/arm64/include/asm/processor.h @@ -45,6 +45,7 @@ #include <asm/ptrace.h> #include <asm/spectre.h> #include <asm/types.h> +#include <linux/kabi.h> /* * TASK_SIZE - the maximum size of a user space task. @@ -187,6 +188,14 @@ struct thread_struct { u64 sctlr_user; u64 svcr; u64 tpidr2_el0; + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) + KABI_RESERVE(6) + KABI_RESERVE(7) + KABI_RESERVE(8) }; static inline unsigned int thread_get_vl(struct thread_struct *thread, -- 2.34.1
participants (1)
-
Yuntao Liu