hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/ID7HLY -------------------------------- sched: Fix kabi for "int idle" moved from CONFIG_FAIR_GROUP_SCHED to CONFIG_GROUP_SCHED_WEIGHT in struct task_group. Fixes: d149b6356644 ("sched: Put task_group::idle under CONFIG_GROUP_SCHED_WEIGHT") Signed-off-by: Zicheng Qu <quzicheng@huawei.com> Signed-off-by: cheliequan <cheliequan@inspur.com> Signed-off-by: Luo Gengkun <luogengkun2@huawei.com> --- kernel/sched/sched.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 345b9c233334..5a248dcb0473 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -450,17 +450,13 @@ struct soft_domain_ctx { struct task_group { struct cgroup_subsys_state css; -#ifdef CONFIG_GROUP_SCHED_WEIGHT - /* A positive value indicates that this is a SCHED_IDLE group. */ - int idle; -#endif - #ifdef CONFIG_FAIR_GROUP_SCHED /* schedulable entities of this group on each CPU */ struct sched_entity **se; /* runqueue "owned" by this group on each CPU */ struct cfs_rq **cfs_rq; unsigned long shares; + KABI_BROKEN_REMOVE(int idle) #ifdef CONFIG_SMP /* * load_avg can be heavily contended at clock tick time, so put @@ -528,7 +524,14 @@ struct task_group { #else KABI_RESERVE(3) #endif + +#ifdef CONFIG_GROUP_SCHED_WEIGHT + /* A positive value indicates that this is a SCHED_IDLE group. */ + KABI_USE(4, int idle) +#else KABI_RESERVE(4) +#endif + KABI_RESERVE(5) KABI_RESERVE(6) KABI_RESERVE(7) -- 2.34.1