diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 89f2a02db563f6fe5f00b2038be6b419b367afc8..fe692e9bd0b27178e64c0eac07e1d6f63e670316 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -1010,6 +1010,14 @@ struct perf_cpu_pmu_context {
 	struct hrtimer			hrtimer;
 	ktime_t				hrtimer_interval;
 	unsigned int			hrtimer_active;
+	KABI_RESERVE(1)
+	KABI_RESERVE(2)
+	KABI_RESERVE(3)
+	KABI_RESERVE(4)
+	KABI_RESERVE(5)
+	KABI_RESERVE(6)
+	KABI_RESERVE(7)
+	KABI_RESERVE(8)
 };
 
 /**
@@ -1031,6 +1039,14 @@ struct perf_cpu_context {
 	int				heap_size;
 	struct perf_event		**heap;
 	struct perf_event		*heap_default[2];
+	KABI_RESERVE(1)
+	KABI_RESERVE(2)
+	KABI_RESERVE(3)
+	KABI_RESERVE(4)
+	KABI_RESERVE(5)
+	KABI_RESERVE(6)
+	KABI_RESERVE(7)
+	KABI_RESERVE(8)
 };
 
 struct perf_output_handle {
diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h
index f46e0ca0169c722b4d5b749b2c1b0b04ab79c380..86d0868b584a0bbc7cfe37e59491af71b118c0d4 100644
--- a/include/linux/uprobes.h
+++ b/include/linux/uprobes.h
@@ -47,6 +47,7 @@ struct uprobe_consumer {
 
 #ifdef CONFIG_UPROBES
 #include <asm/uprobes.h>
+#include <linux/kabi.h>
 
 enum uprobe_task_state {
 	UTASK_RUNNING,
@@ -78,6 +79,14 @@ struct uprobe_task {
 
 	struct return_instance		*return_instances;
 	unsigned int			depth;
+	KABI_RESERVE(1)
+	KABI_RESERVE(2)
+	KABI_RESERVE(3)
+	KABI_RESERVE(4)
+	KABI_RESERVE(5)
+	KABI_RESERVE(6)
+	KABI_RESERVE(7)
+	KABI_RESERVE(8)
 };
 
 struct return_instance {
diff --git a/kernel/events/internal.h b/kernel/events/internal.h
index d2e6e6144c54273ef0ecde17aca5975b42c03af4..d1ffa00b91b68a665586fce0d5a6d7bb290ab26a 100644
--- a/kernel/events/internal.h
+++ b/kernel/events/internal.h
@@ -5,6 +5,7 @@
 #include <linux/hardirq.h>
 #include <linux/uaccess.h>
 #include <linux/refcount.h>
+#include <linux/kabi.h>
 
 /* Buffer handling */
 
@@ -54,6 +55,15 @@ struct perf_buffer {
 	void				**aux_pages;
 	void				*aux_priv;
 
+	KABI_RESERVE(1)
+	KABI_RESERVE(2)
+	KABI_RESERVE(3)
+	KABI_RESERVE(4)
+	KABI_RESERVE(5)
+	KABI_RESERVE(6)
+	KABI_RESERVE(7)
+	KABI_RESERVE(8)
+
 	struct perf_event_mmap_page	*user_page;
 	void				*data_pages[];
 };