diff options
| author | Michal Koutný <mkoutny@suse.com> | 2025-03-10 18:04:33 +0100 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2025-04-08 20:55:52 +0200 |
| commit | 433bce5dadb4ec3d5eda99c5125926c045b79005 (patch) | |
| tree | 3b305c22dd69a9d933bb70c6618b9a401f1fdcd4 | |
| parent | f2d650618bc721760199ae0133c73ec32c63817e (diff) | |
sched: Convert CONFIG_RT_GROUP_SCHED macros to code conditions
Convert the blocks guarded by macros to regular code so that the RT
group code gets more compile validation. Reasoning is in
Documentation/process/coding-style.rst 21) Conditional Compilation.
With that, no functional change is expected.
Signed-off-by: Michal Koutný <mkoutny@suse.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20250310170442.504716-2-mkoutny@suse.com
| -rw-r--r-- | kernel/sched/rt.c | 10 | ||||
| -rw-r--r-- | kernel/sched/syscalls.c | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index fa03ec3ed56a..2ade81e69db0 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -1066,13 +1066,12 @@ inc_rt_prio_smp(struct rt_rq *rt_rq, int prio, int prev_prio) { struct rq *rq = rq_of_rt_rq(rt_rq); -#ifdef CONFIG_RT_GROUP_SCHED /* * Change rq's cpupri only if rt_rq is the top queue. */ - if (&rq->rt != rt_rq) + if (IS_ENABLED(CONFIG_RT_GROUP_SCHED) && &rq->rt != rt_rq) return; -#endif + if (rq->online && prio < prev_prio) cpupri_set(&rq->rd->cpupri, rq->cpu, prio); } @@ -1082,13 +1081,12 @@ dec_rt_prio_smp(struct rt_rq *rt_rq, int prio, int prev_prio) { struct rq *rq = rq_of_rt_rq(rt_rq); -#ifdef CONFIG_RT_GROUP_SCHED /* * Change rq's cpupri only if rt_rq is the top queue. */ - if (&rq->rt != rt_rq) + if (IS_ENABLED(CONFIG_RT_GROUP_SCHED) && &rq->rt != rt_rq) return; -#endif + if (rq->online && rt_rq->highest_prio.curr != prev_prio) cpupri_set(&rq->rd->cpupri, rq->cpu, rt_rq->highest_prio.curr); } diff --git a/kernel/sched/syscalls.c b/kernel/sched/syscalls.c index c326de1344fb..2bf528116fad 100644 --- a/kernel/sched/syscalls.c +++ b/kernel/sched/syscalls.c @@ -640,7 +640,7 @@ change: retval = -EPERM; goto unlock; } -#endif +#endif /* CONFIG_RT_GROUP_SCHED */ #ifdef CONFIG_SMP if (dl_bandwidth_enabled() && dl_policy(policy) && !(attr->sched_flags & SCHED_FLAG_SUGOV)) { |