diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
index 2e4733a2e73788923ba60f8c0703686bb96b449f..9f7ca79cc76a815c12358fb38902d7f7556d8b43 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 c826ad282dc96f35c7e4ce0f97a132e8cbb0b34a..6dba5059aa60a245e3e1a0b7850e65f462b11eb0 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 7a931f95e1ce7af6ea4f67e1d90f0f776e0e52c7..a225c6e2ca6dbed73f35a412c78dda2ee0e308e8 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)			\