hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/IDC9YK -------------------------------- sched_ext: Fix kabi for u32 scx_flags and u32 scx_weight in struct task_group. Fixes: b710760a3036 ("sched_ext: Add cgroup support") Signed-off-by: Zicheng Qu <quzicheng@huawei.com> --- kernel/sched/sched.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 4a342867620d..1d7d32efd1d1 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -476,11 +476,6 @@ struct task_group { struct rt_bandwidth rt_bandwidth; #endif -#ifdef CONFIG_EXT_GROUP_SCHED - u32 scx_flags; /* SCX_TG_* */ - u32 scx_weight; -#endif - struct rcu_head rcu; struct list_head list; @@ -525,7 +520,12 @@ struct task_group { #else KABI_RESERVE(2) #endif + +#ifdef CONFIG_EXT_GROUP_SCHED + KABI_USE2(3, u32 scx_flags, u32 scx_weight) /* SCX_TG_* */ +#else KABI_RESERVE(3) +#endif KABI_RESERVE(4) KABI_RESERVE(5) KABI_RESERVE(6) -- 2.34.1