diff --git a/arch/arm64/include/asm/extable.h b/arch/arm64/include/asm/extable.h
index f80ebd0addfdea9af592e2c42712dd4c05dacd9a..5355382bf80aa3502891de43ede51f6207d6e2b3 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
diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h
index 44cada63ed08083040f2893846029bdf72faa749..9e688b1b13d464bf6c5698da915e2d9833d573db 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,
diff --git a/include/linux/efi.h b/include/linux/efi.h
index 80b21d1c6eafafd825686b8454e66808a83ce470..4e89a4aac75aef90f52f84c5fc1160fe051d836b 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
diff --git a/include/linux/fb.h b/include/linux/fb.h
index c14576458228a3443d6d6e73e04c9a3ef376bd64..ab2a9f4163c7a7506564bc4ddef42d7375c2ae02 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