Commit 433bce5d authored by Michal Koutný's avatar Michal Koutný Committed by Peter Zijlstra
Browse files

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: default avatarMichal Koutný <mkoutny@suse.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20250310170442.504716-2-mkoutny@suse.com
parent f2d65061

kernel/sched/rt.c

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

}

kernel/sched/syscalls.c

+1 −1
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ int __sched_setscheduler(struct task_struct *p, 
			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)) {