diff options
| author | Tejun Heo <tj@kernel.org> | 2025-10-29 05:18:13 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2025-10-29 05:18:13 -1000 |
| commit | 2d697e5f5a036d5705d570ce55a140832e92d25c (patch) | |
| tree | 59476fedd61450f56dc2c94b7ef8277fed08dc82 /kernel/sched/ext.c | |
| parent | b7d4b28db7da89de1d03316c4e67b5a47390fcd3 (diff) | |
| parent | f4fa7c25f632cd925352b4d46f245653a23b1d1a (diff) | |
Merge branch 'for-6.18-fixes' into for-6.19
Pull to receive f4fa7c25f632 ("sched_ext: Fix use of uninitialized variable
in scx_bpf_cpuperf_set()") which conflicts with changes for planned
sub-sched changes.
Diffstat (limited to 'kernel/sched/ext.c')
| -rw-r--r-- | kernel/sched/ext.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c index 603de983a509..75e9f8352f8c 100644 --- a/kernel/sched/ext.c +++ b/kernel/sched/ext.c @@ -6532,7 +6532,7 @@ __bpf_kfunc void scx_bpf_cpuperf_set(s32 cpu, u32 perf) guard(rcu)(); - sch = rcu_dereference(sch); + sch = rcu_dereference(scx_root); if (unlikely(!sch)) return; |