Commit 2d697e5f authored by Tejun Heo's avatar Tejun Heo
Browse files

Merge branch 'for-6.18-fixes' into for-6.19 

Pull to receive f4fa7c25 ("sched_ext: Fix use of uninitialized variable
in scx_bpf_cpuperf_set()") which conflicts with changes for planned
sub-sched changes.
parents b7d4b28d f4fa7c25

kernel/sched/ext.c

+1 −1
Original line number Diff line number Diff line
@@ -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;