Commit 3eca109a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

sched: Clean up and standardize #if/#else/#endif markers in sched/rt.c 



 - Use the standard #ifdef marker format for larger blocks,
   where appropriate:

        #if CONFIG_FOO
        ...
        #else /* !CONFIG_FOO: */
        ...
        #endif /* !CONFIG_FOO */

 - Fix whitespace noise and other inconsistencies.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarPeter Zijlstra <peterz@infradead.org>
Cc: Dietmar Eggemann <dietmar.eggemann@arm.com>
Cc: Juri Lelli <juri.lelli@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Shrikanth Hegde <sshegde@linux.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Valentin Schneider <vschneid@redhat.com>
Cc: Vincent Guittot <vincent.guittot@linaro.org>
Link: https://lore.kernel.org/r/20250528080924.2273858-15-mingo@kernel.org
parent fd3db705

kernel/sched/rt.c

+27 −27
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static int __init sched_rt_sysctl_init(void) 
	return 0;

}

late_initcall(sched_rt_sysctl_init);

#endif

#endif /* CONFIG_SYSCTL */



void init_rt_rq(struct rt_rq *rt_rq)

{
@@ -294,7 +294,7 @@ int alloc_rt_sched_group(struct task_group *tg, struct task_group *parent) 
	return 0;

}



#else /* CONFIG_RT_GROUP_SCHED */

#else /* !CONFIG_RT_GROUP_SCHED: */



#define rt_entity_is_task(rt_se) (1)
@@ -330,7 +330,7 @@ int alloc_rt_sched_group(struct task_group *tg, struct task_group *parent) 
{

	return 1;

}

#endif /* CONFIG_RT_GROUP_SCHED */

#endif /* !CONFIG_RT_GROUP_SCHED */



#ifdef CONFIG_SMP
@@ -433,7 +433,7 @@ static void dequeue_pushable_task(struct rq *rq, struct task_struct *p) 
	}

}



#else

#else /* !CONFIG_SMP: */



static inline void enqueue_pushable_task(struct rq *rq, struct task_struct *p)

{
@@ -446,7 +446,7 @@ static inline void dequeue_pushable_task(struct rq *rq, struct task_struct *p) 
static inline void rt_queue_push_tasks(struct rq *rq)

{

}

#endif /* CONFIG_SMP */

#endif /* !CONFIG_SMP */



static void enqueue_top_rt_rq(struct rt_rq *rt_rq);

static void dequeue_top_rt_rq(struct rt_rq *rt_rq, unsigned int count);
@@ -488,12 +488,12 @@ static inline bool rt_task_fits_capacity(struct task_struct *p, int cpu) 


	return cpu_cap >= min(min_cap, max_cap);

}

#else

#else /* !CONFIG_UCLAMP_TASK: */

static inline bool rt_task_fits_capacity(struct task_struct *p, int cpu)

{

	return true;

}

#endif

#endif /* !CONFIG_UCLAMP_TASK */



#ifdef CONFIG_RT_GROUP_SCHED
@@ -801,9 +801,9 @@ static void balance_runtime(struct rt_rq *rt_rq) 
		raw_spin_lock(&rt_rq->rt_runtime_lock);

	}

}

#else /* !CONFIG_SMP */

#else /* !CONFIG_SMP: */

static inline void balance_runtime(struct rt_rq *rt_rq) {}

#endif /* CONFIG_SMP */

#endif /* !CONFIG_SMP */



static int do_sched_rt_period_timer(struct rt_bandwidth *rt_b, int overrun)

{
@@ -933,7 +933,7 @@ static int sched_rt_runtime_exceeded(struct rt_rq *rt_rq) 
	return 0;

}



#else /* !CONFIG_RT_GROUP_SCHED */

#else /* !CONFIG_RT_GROUP_SCHED: */



typedef struct rt_rq *rt_rq_iter_t;
@@ -985,7 +985,7 @@ static void __enable_runtime(struct rq *rq) { } 
static void __disable_runtime(struct rq *rq) { }

#endif



#endif /* CONFIG_RT_GROUP_SCHED */

#endif /* !CONFIG_RT_GROUP_SCHED */



static inline int rt_se_prio(struct sched_rt_entity *rt_se)

{
@@ -1036,7 +1036,7 @@ static void update_curr_rt(struct rq *rq) 
				do_start_rt_bandwidth(sched_rt_bandwidth(rt_rq));

		}

	}

#endif

#endif /* CONFIG_RT_GROUP_SCHED */

}



static void
@@ -1110,14 +1110,14 @@ dec_rt_prio_smp(struct rt_rq *rt_rq, int prio, int prev_prio) 
		cpupri_set(&rq->rd->cpupri, rq->cpu, rt_rq->highest_prio.curr);

}



#else /* CONFIG_SMP */

#else /* !CONFIG_SMP: */



static inline

void inc_rt_prio_smp(struct rt_rq *rt_rq, int prio, int prev_prio) {}

static inline

void dec_rt_prio_smp(struct rt_rq *rt_rq, int prio, int prev_prio) {}



#endif /* CONFIG_SMP */

#endif /* !CONFIG_SMP */



#if defined CONFIG_SMP || defined CONFIG_RT_GROUP_SCHED

static void
@@ -1158,12 +1158,12 @@ dec_rt_prio(struct rt_rq *rt_rq, int prio) 
	dec_rt_prio_smp(rt_rq, prio, prev_prio);

}



#else

#else /* !(CONFIG_SMP || CONFIG_RT_GROUP_SCHED): */



static inline void inc_rt_prio(struct rt_rq *rt_rq, int prio) {}

static inline void dec_rt_prio(struct rt_rq *rt_rq, int prio) {}



#endif /* CONFIG_SMP || CONFIG_RT_GROUP_SCHED */

#endif /* !(CONFIG_SMP || CONFIG_RT_GROUP_SCHED) */



#ifdef CONFIG_RT_GROUP_SCHED
@@ -1185,7 +1185,7 @@ dec_rt_group(struct sched_rt_entity *rt_se, struct rt_rq *rt_rq) 
	WARN_ON(!rt_rq->rt_nr_running && rt_rq->rt_nr_boosted);

}



#else /* CONFIG_RT_GROUP_SCHED */

#else /* !CONFIG_RT_GROUP_SCHED: */



static void

inc_rt_group(struct sched_rt_entity *rt_se, struct rt_rq *rt_rq)
@@ -1195,7 +1195,7 @@ inc_rt_group(struct sched_rt_entity *rt_se, struct rt_rq *rt_rq) 
static inline

void dec_rt_group(struct sched_rt_entity *rt_se, struct rt_rq *rt_rq) {}



#endif /* CONFIG_RT_GROUP_SCHED */

#endif /* !CONFIG_RT_GROUP_SCHED */



static inline

unsigned int rt_se_nr_running(struct sched_rt_entity *rt_se)
@@ -1685,7 +1685,7 @@ static void wakeup_preempt_rt(struct rq *rq, struct task_struct *p, int flags) 
	 */

	if (p->prio == donor->prio && !test_tsk_need_resched(rq->curr))

		check_preempt_equal_prio(rq, p);

#endif

#endif /* CONFIG_SMP */

}



static inline void set_next_task_rt(struct rq *rq, struct task_struct *p, bool first)
@@ -2512,11 +2512,11 @@ prio_changed_rt(struct rq *rq, struct task_struct *p, int oldprio) 
		 */

		if (p->prio > rq->rt.highest_prio.curr)

			resched_curr(rq);

#else

#else /* !CONFIG_SMP: */

		/* For UP simply resched on drop of prio */

		if (oldprio < p->prio)

			resched_curr(rq);

#endif /* CONFIG_SMP */

#endif /* !CONFIG_SMP */

	} else {

		/*

		 * This task is not running, but if it is
@@ -2552,9 +2552,9 @@ static void watchdog(struct rq *rq, struct task_struct *p) 
		}

	}

}

#else

#else /* !CONFIG_POSIX_TIMERS: */

static inline void watchdog(struct rq *rq, struct task_struct *p) { }

#endif

#endif /* !CONFIG_POSIX_TIMERS */



/*

 * scheduler tick hitting a task of our scheduling class.
@@ -2623,7 +2623,7 @@ static int task_is_throttled_rt(struct task_struct *p, int cpu) 


	return rt_rq_throttled(rt_rq);

}

#endif

#endif /* CONFIG_SCHED_CORE */



DEFINE_SCHED_CLASS(rt) = {
@@ -2646,7 +2646,7 @@ DEFINE_SCHED_CLASS(rt) = { 
	.task_woken		= task_woken_rt,

	.switched_from		= switched_from_rt,

	.find_lock_rq		= find_lock_lowest_rq,

#endif

#endif /* !CONFIG_SMP */



	.task_tick		= task_tick_rt,
@@ -2890,7 +2890,7 @@ int sched_rt_can_attach(struct task_group *tg, struct task_struct *tsk) 
	return 1;

}



#else /* !CONFIG_RT_GROUP_SCHED */

#else /* !CONFIG_RT_GROUP_SCHED: */



#ifdef CONFIG_SYSCTL

static int sched_rt_global_constraints(void)
@@ -2898,7 +2898,7 @@ static int sched_rt_global_constraints(void) 
	return 0;

}

#endif /* CONFIG_SYSCTL */

#endif /* CONFIG_RT_GROUP_SCHED */

#endif /* !CONFIG_RT_GROUP_SCHED */



#ifdef CONFIG_SYSCTL

static int sched_rt_global_validate(void)