From 49d22554c5be6f6a69612040ee5b4c82ce84e1ab Mon Sep 17 00:00:00 2001 From: Yuntao Liu Date: Tue, 30 Jan 2024 01:18:17 +0000 Subject: [PATCH 1/4] kabi: reserve space for efi.h hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8X87C -------------------------------- reserve space for efi.h Signed-off-by: Yuntao Liu --- 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 #include +#include 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 -- Gitee From 5cf258b327c0d194f533faec11921cf7d42e969b Mon Sep 17 00:00:00 2001 From: Yuntao Liu Date: Tue, 30 Jan 2024 01:18:18 +0000 Subject: [PATCH 2/4] kabi: reserve space for extable.h hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8X87C -------------------------------- reserve space for extable.h Signed-off-by: Yuntao Liu --- 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 /* * 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 -- Gitee From 9f0590cfd69a7f2f41c67c9154cf728b5892005a Mon Sep 17 00:00:00 2001 From: Yuntao Liu Date: Tue, 30 Jan 2024 01:18:19 +0000 Subject: [PATCH 3/4] kabi: reserve space for fb.h hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8X87C -------------------------------- reserve space for fb.h Signed-off-by: Yuntao Liu --- 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 #include +#include 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 -- Gitee From 5b79abde9a980881fe2782e4ef111b3ffeac21ed Mon Sep 17 00:00:00 2001 From: Yuntao Liu Date: Tue, 30 Jan 2024 01:18:20 +0000 Subject: [PATCH 4/4] kabi: reserve space for processor.h hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8X87C -------------------------------- reserve space for processor.h Signed-off-by: Yuntao Liu --- 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 #include #include +#include /* * 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, -- Gitee