diff options
| author | Tejun Heo <tj@kernel.org> | 2025-04-29 08:24:58 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2025-04-29 08:24:58 -1000 |
| commit | ce565f839c9e1c0952588f2b17ed4b02650f94b0 (patch) | |
| tree | ae0931af7b708e5aa5fdeff78723a4d821562c9a /kernel | |
| parent | 069ac9e161eb9d5bfd5a4a5bf016522353226a51 (diff) | |
| parent | e38be1c7647c8c78304ce6d931b3b654e27948b3 (diff) | |
Merge branch 'for-6.15-fixes' into for-6.16
To receive e38be1c7647c ("sched_ext: Fix rq lock state in hotplug ops") to
avoid conflicts with scx_sched related patches pending for for-6.16.
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched/ext.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c index 6e530a91e944..59b49b3a3bbb 100644 --- a/kernel/sched/ext.c +++ b/kernel/sched/ext.c @@ -3491,9 +3491,9 @@ static void handle_hotplug(struct rq *rq, bool online) scx_idle_update_selcpu_topology(&scx_ops); if (online && SCX_HAS_OP(cpu_online)) - SCX_CALL_OP(SCX_KF_UNLOCKED, cpu_online, rq, cpu); + SCX_CALL_OP(SCX_KF_UNLOCKED, cpu_online, NULL, cpu); else if (!online && SCX_HAS_OP(cpu_offline)) - SCX_CALL_OP(SCX_KF_UNLOCKED, cpu_offline, rq, cpu); + SCX_CALL_OP(SCX_KF_UNLOCKED, cpu_offline, NULL, cpu); else scx_exit(SCX_ECODE_ACT_RESTART | SCX_ECODE_RSN_HOTPLUG, "cpu %d going %s, exiting scheduler", cpu, @@ -7362,12 +7362,6 @@ BTF_ID_FLAGS(func, scx_bpf_nr_cpu_ids) BTF_ID_FLAGS(func, scx_bpf_get_possible_cpumask, KF_ACQUIRE) BTF_ID_FLAGS(func, scx_bpf_get_online_cpumask, KF_ACQUIRE) BTF_ID_FLAGS(func, scx_bpf_put_cpumask, KF_RELEASE) -BTF_ID_FLAGS(func, scx_bpf_get_idle_cpumask, KF_ACQUIRE) -BTF_ID_FLAGS(func, scx_bpf_get_idle_smtmask, KF_ACQUIRE) -BTF_ID_FLAGS(func, scx_bpf_put_idle_cpumask, KF_RELEASE) -BTF_ID_FLAGS(func, scx_bpf_test_and_clear_cpu_idle) -BTF_ID_FLAGS(func, scx_bpf_pick_idle_cpu, KF_RCU) -BTF_ID_FLAGS(func, scx_bpf_pick_any_cpu, KF_RCU) BTF_ID_FLAGS(func, scx_bpf_task_running, KF_RCU) BTF_ID_FLAGS(func, scx_bpf_task_cpu, KF_RCU) BTF_ID_FLAGS(func, scx_bpf_cpu_rq) |