hulk inclusion category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IB1OJX

--------------------------------

The KABI consistency interface of the mmcid data structure is changed from KABI_REPLACE to KABI_DEPRECATE.

Fixes: 7a35fa06727d ("rseq/mm_cid: change the mm_cid macro default status and keep KABI consistent") Signed-off-by: He Yujie coka.heyujie@huawei.com --- include/linux/mm_types.h | 5 ++--- include/linux/sched.h | 11 +++++------ 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index fdc047bdbc49..4b9a8723d3eb 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -788,9 +788,8 @@ struct mm_struct { */ unsigned long mm_cid_next_scan; #else - KABI_REPLACE(struct mm_cid __percpu *pcpu_cid, - struct mm_cid __percpu *pcpu_cid) - KABI_REPLACE(unsigned long mm_cid_next_scan, unsigned long mm_cid_next_scan) + KABI_DEPRECATE(struct mm_cid __percpu *, pcpu_cid) + KABI_DEPRECATE(unsigned long, mm_cid_next_scan) #endif #ifdef CONFIG_MMU atomic_long_t pgtables_bytes; /* size of all page tables */ diff --git a/include/linux/sched.h b/include/linux/sched.h index b8be76b0c120..b8abb84382db 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1358,12 +1358,11 @@ struct task_struct { int mm_cid_active; /* Whether cid bitmap is active */ struct callback_head cid_work; #else - KABI_REPLACE(int mm_cid, int mm_cid) - KABI_REPLACE(int last_mm_cid, int last_mm_cid) - KABI_REPLACE(int migrate_from_cpu, int migrate_from_cpu) - KABI_REPLACE(int mm_cid_active, int mm_cid_active) - KABI_REPLACE(struct callback_head cid_work, - struct callback_head cid_work) + KABI_DEPRECATE(int, mm_cid) + KABI_DEPRECATE(int, last_mm_cid) + KABI_DEPRECATE(int, migrate_from_cpu) + KABI_DEPRECATE(int, mm_cid_active) + KABI_DEPRECATE(struct callback_head, cid_work) #endif

struct tlbflush_unmap_batch tlb_ubc;