From: Lin Ruizhe <linruizhe@huawei.com> hulk inclusion bugzilla: https://gitee.com/openeuler/kernel/issues/I8PS7G CVE: NA --------------------------------------------- Add KABI_RESERVE in msi.h Signed-off-by: Lin Ruizhe <linruizhe@huawei.com> conflict: include/linux/msi.h.rej Signed-off-by: Lin Yujun <linyujun809@huawei.com> --- include/linux/msi.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/linux/msi.h b/include/linux/msi.h index ddace8c34dcf..e3bc03fc38bc 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -26,6 +26,7 @@ #include <linux/list.h> #include <linux/irq.h> #include <linux/bits.h> +#include <linux/kabi.h> #include <asm/msi.h> @@ -203,6 +204,8 @@ struct msi_desc { struct pci_msi_desc pci; struct msi_desc_data data; }; + KABI_RESERVE(1) + KABI_RESERVE(2) }; /* -- 2.34.1