From: Wang Tao <wangtao554@huawei.com> Offering: HULK hulk inclusion category: bugfix bugzilla: NA -------------------------------- Fixes: 3104af4d6492 ("[Backport] sched/fair: Add related data structure for task based throttle") Signed-off-by: Wang Tao <wangtao554@huawei.com> --- include/linux/sched.h | 13 ++++++++----- kernel/sched/sched.h | 6 +++--- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index 63aaa1b767bf..45e010dfe7b2 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -847,11 +847,6 @@ struct task_struct { #ifdef CONFIG_CGROUP_SCHED struct task_group *sched_task_group; -#ifdef CONFIG_CFS_BANDWIDTH - struct callback_head sched_throttle_work; - struct list_head throttle_node; - bool throttled; -#endif #endif #ifdef CONFIG_UCLAMP_TASK @@ -1633,11 +1628,19 @@ struct task_struct { KABI_RESERVE(2) /* saved state for "spinlock sleepers" */ KABI_USE2(3, unsigned kabi_reserved_int, unsigned int saved_state) +#ifdef CONFIG_CFS_BANDWIDTH + KABI_REPLACE(_KABI_RESERVE(4); _KABI_RESERVE(5), + struct callback_head sched_throttle_work) + KABI_REPLACE(_KABI_RESERVE(6); _KABI_RESERVE(7), + struct list_head throttle_node) + KABI_USE(8, bool throttled) +#else KABI_RESERVE(4) KABI_RESERVE(5) KABI_RESERVE(6) KABI_RESERVE(7) KABI_RESERVE(8) +#endif KABI_RESERVE(9) KABI_RESERVE(10) KABI_RESERVE(11) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index f1fd008faaf7..8691a409ee6e 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -765,7 +765,6 @@ struct cfs_rq { #ifdef CONFIG_SMP struct list_head throttled_csd_list; #endif - struct list_head throttled_limbo_list; #endif /* CONFIG_CFS_BANDWIDTH */ #endif /* CONFIG_FAIR_GROUP_SCHED */ @@ -790,8 +789,9 @@ struct cfs_rq { KABI_RESERVE(3) KABI_RESERVE(4) #endif - KABI_RESERVE(5) - KABI_RESERVE(6) +#endif + KABI_REPLACE(_KABI_RESERVE(5); _KABI_RESERVE(6), + struct list_head throttled_limbo_list) KABI_RESERVE(7) KABI_RESERVE(8) }; -- 2.18.0