Unverified Commit 799dba2d authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13408 rseq/mm_cid: change KABI consistency interface 

Merge Pull Request from: @ci-robot 
 
PR sync from: He Yujie <coka.heyujie@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/Q2EUX3NZWO7I32CLEPIEBXC4DYMAAZAR/ 
 
https://gitee.com/src-openeuler/kernel/issues/IB1OJX 
 
Link:https://gitee.com/openeuler/kernel/pulls/13408

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents b91870b1 e92e03af

include/linux/mm_types.h

+2 −3
Original line number Diff line number Diff line
@@ -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 */

include/linux/sched.h

+5 −6
Original line number Diff line number Diff line
@@ -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;