diff options
| author | Tejun Heo <tj@kernel.org> | 2025-06-20 17:01:21 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2025-06-20 17:01:21 -1000 |
| commit | e4e149dd2f80b3f61d738f0b7d9cc9772c1353a4 (patch) | |
| tree | b9f802fff1919304df07cfba45a18ea68e254ad5 /kernel/sched/core.c | |
| parent | e4ee150fea818c8519a0921d53794b763af1a006 (diff) | |
| parent | 33796b91871ad4010c8188372dd1faf97cf0f1c0 (diff) | |
sched_ext: Merge branch 'for-6.16-fixes' into for-6.17
Pull sched_ext/for-6.16-fixes to receive:
c50784e99f0e ("sched_ext: Make scx_group_set_weight() always update tg->scx.weight")
33796b91871a ("sched_ext, sched/core: Don't call scx_group_set_weight() prematurely from sched_create_group()")
which are needed to implement CPU bandwidth control interface support.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel/sched/core.c')
| -rw-r--r-- | kernel/sched/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 2f8caa9db78d..0e3a00e2a2cc 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -8437,7 +8437,7 @@ void __init sched_init(void) init_cfs_bandwidth(&root_task_group.cfs_bandwidth, NULL); #endif /* CONFIG_FAIR_GROUP_SCHED */ #ifdef CONFIG_EXT_GROUP_SCHED - root_task_group.scx_weight = CGROUP_WEIGHT_DFL; + scx_tg_init(&root_task_group); #endif /* CONFIG_EXT_GROUP_SCHED */ #ifdef CONFIG_RT_GROUP_SCHED root_task_group.rt_se = (struct sched_rt_entity **)ptr; @@ -8872,7 +8872,7 @@ struct task_group *sched_create_group(struct task_group *parent) if (!alloc_rt_sched_group(tg, parent)) goto err; - scx_group_set_weight(tg, CGROUP_WEIGHT_DFL); + scx_tg_init(tg); alloc_uclamp_sched_group(tg, parent); return tg; |