From: JiangJieHua <jiangjiehua1@huawei.com> hulk inclusion category: feature bugzilla: https://atomgit.com/openeuler/kernel/issues/10109 -------------------------------- This patch fixes the breakage of KABI due to napi irq, use the reserved domain segment of KABI 1. Signed-off-by: JiangJieHua <jiangjiehua1@huawei.com> Reviewed-by: Zhang Changzhong <zhangchangzhong@huawei.com> --- include/linux/netdevice.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 368f217e07bd..8668973f363c 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -393,9 +393,8 @@ struct napi_struct { /* control-path-only fields follow */ struct list_head dev_list; struct hlist_node napi_hash_node; - int irq; - KABI_RESERVE(1) + KABI_USE(1, int irq) KABI_RESERVE(2) KABI_RESERVE(3) KABI_RESERVE(4) -- 2.18.0.huawei.25