From: Lin Ruizhe linruizhe@huawei.com
hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA
---------------------------
Add KABI_RESERVE in irq_desc
conflict: include/linux/irqdesc.h
Signed-off-by: Lin Yujun linyujun809@huawei.com --- include/linux/irqdesc.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h index d9451d456a73..1736250b3210 100644 --- a/include/linux/irqdesc.h +++ b/include/linux/irqdesc.h @@ -5,7 +5,7 @@ #include <linux/rcupdate.h> #include <linux/kobject.h> #include <linux/mutex.h> - +#include <linux/kabi.h> /* * Core internal functions to deal with irq descriptors */ @@ -105,6 +105,7 @@ struct irq_desc { #ifdef CONFIG_HARDIRQS_SW_RESEND struct hlist_node resend_node; #endif + KABI_RESERVE(1) } ____cacheline_internodealigned_in_smp;
#ifdef CONFIG_SPARSE_IRQ