From: Zhou Guanghui <zhouguanghui1@huawei.com> ascend inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4EUVI CVE: NA ------------------------------------------------- fix kabi broken in struct mm_struct It's introduced by b82e34a7de33 ("ascend: mm_struct: introduce new parameter...") Signed-off-by: Zhou Guanghui <zhouguanghui1@huawei.com> Reviewed-by: Weilong Chen <chenweilong@huawei.com> Reviewed-by: Ding Tianhong <dingtianhong@huawei.com> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- include/linux/mm_types.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 4e45bfd088bff..ae4237a59d21c 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -520,11 +520,15 @@ struct mm_struct { KABI_RESERVE(1) #endif -#ifdef CONFIG_ASCEND_SHARE_POOL - struct sp_group_master *sp_group_master; +#if IS_ENABLED(CONFIG_ASCEND_SHARE_POOL) && !defined(__GENKSYMS__) + union { + struct sp_group_master *sp_group_master; + unsigned long kabi_reserve1; + }; +#else + KABI_RESERVE(2) #endif - KABI_RESERVE(2) KABI_RESERVE(3) KABI_RESERVE(4) KABI_RESERVE(5) -- 2.25.1