sched/deadline, rt: Rename queue_push_tasks/queue_pull_task to create separate namespace

Ingo Molnar · Ingo Molnar · commit 02d8ec9456f4 · 2018-03-04T12:39:34.000+01:00
There are similarly named functions in both of these modules:

  kernel/sched/deadline.c:static inline void queue_push_tasks(struct rq *rq)
  kernel/sched/deadline.c:static inline void queue_pull_task(struct rq *rq)
  kernel/sched/deadline.c:static inline void queue_push_tasks(struct rq *rq)
  kernel/sched/deadline.c:static inline void queue_pull_task(struct rq *rq)
  kernel/sched/deadline.c:	queue_push_tasks(rq);
  kernel/sched/deadline.c:	queue_pull_task(rq);
  kernel/sched/deadline.c:			queue_push_tasks(rq);
  kernel/sched/deadline.c:			queue_pull_task(rq);
  kernel/sched/rt.c:static inline void queue_push_tasks(struct rq *rq)
  kernel/sched/rt.c:static inline void queue_pull_task(struct rq *rq)
  kernel/sched/rt.c:static inline void queue_push_tasks(struct rq *rq)
  kernel/sched/rt.c:	queue_push_tasks(rq);
  kernel/sched/rt.c:	queue_pull_task(rq);
  kernel/sched/rt.c:			queue_push_tasks(rq);
  kernel/sched/rt.c:			queue_pull_task(rq);

... which makes it harder to grep for them. Prefix them with
deadline_ and rt_, respectively.

Cc: Peter Zijlstra &lt;peterz@infradead.org&gt;
Cc: Mike Galbraith &lt;efault@gmx.de&gt;
Cc: Thomas Gleixner &lt;tglx@linutronix.de&gt;
Cc: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar &lt;mingo@kernel.org&gt;
diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
@@ -511,15 +511,15 @@ static DEFINE_PER_CPU(struct callback_head, dl_pull_head);
 static void push_dl_tasks(struct rq *);
 static void pull_dl_task(struct rq *);
 
-static inline void queue_push_tasks(struct rq *rq)
+static inline void deadline_queue_push_tasks(struct rq *rq)
 {
 	if (!has_pushable_dl_tasks(rq))
 		return;
 
 	queue_balance_callback(rq, &per_cpu(dl_push_head, rq->cpu), push_dl_tasks);
 }
 
-static inline void queue_pull_task(struct rq *rq)
+static inline void deadline_queue_pull_task(struct rq *rq)
 {
 	queue_balance_callback(rq, &per_cpu(dl_pull_head, rq->cpu), pull_dl_task);
 }
@@ -594,11 +594,11 @@ static inline void pull_dl_task(struct rq *rq)
 {
 }
 
-static inline void queue_push_tasks(struct rq *rq)
+static inline void deadline_queue_push_tasks(struct rq *rq)
 {
 }
 
-static inline void queue_pull_task(struct rq *rq)
+static inline void deadline_queue_pull_task(struct rq *rq)
 {
 }
 #endif /* CONFIG_SMP */
@@ -1759,7 +1759,7 @@ pick_next_task_dl(struct rq *rq, struct task_struct *prev, struct rq_flags *rf)
 	if (hrtick_enabled(rq))
 		start_hrtick_dl(rq, p);
 
-	queue_push_tasks(rq);
+	deadline_queue_push_tasks(rq);
 
 	return p;
 }
@@ -2309,7 +2309,7 @@ static void switched_from_dl(struct rq *rq, struct task_struct *p)
 	if (!task_on_rq_queued(p) || rq->dl.dl_nr_running)
 		return;
 
-	queue_pull_task(rq);
+	deadline_queue_pull_task(rq);
 }
 
 /*
@@ -2331,7 +2331,7 @@ static void switched_to_dl(struct rq *rq, struct task_struct *p)
 	if (rq->curr != p) {
 #ifdef CONFIG_SMP
 		if (p->nr_cpus_allowed > 1 && rq->dl.overloaded)
-			queue_push_tasks(rq);
+			deadline_queue_push_tasks(rq);
 #endif
 		if (dl_task(rq->curr))
 			check_preempt_curr_dl(rq, p, 0);
@@ -2356,7 +2356,7 @@ static void prio_changed_dl(struct rq *rq, struct task_struct *p,
 		 * or lowering its prio, so...
 		 */
 		if (!rq->dl.overloaded)
-			queue_pull_task(rq);
+			deadline_queue_pull_task(rq);
 
 		/*
 		 * If we now have a earlier deadline task than p,
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
@@ -355,15 +355,15 @@ static DEFINE_PER_CPU(struct callback_head, rt_pull_head);
 static void push_rt_tasks(struct rq *);
 static void pull_rt_task(struct rq *);
 
-static inline void queue_push_tasks(struct rq *rq)
+static inline void rt_queue_push_tasks(struct rq *rq)
 {
 	if (!has_pushable_tasks(rq))
 		return;
 
 	queue_balance_callback(rq, &per_cpu(rt_push_head, rq->cpu), push_rt_tasks);
 }
 
-static inline void queue_pull_task(struct rq *rq)
+static inline void rt_queue_pull_task(struct rq *rq)
 {
 	queue_balance_callback(rq, &per_cpu(rt_pull_head, rq->cpu), pull_rt_task);
 }
@@ -421,7 +421,7 @@ static inline void pull_rt_task(struct rq *this_rq)
 {
 }
 
-static inline void queue_push_tasks(struct rq *rq)
+static inline void rt_queue_push_tasks(struct rq *rq)
 {
 }
 #endif /* CONFIG_SMP */
@@ -1565,7 +1565,7 @@ pick_next_task_rt(struct rq *rq, struct task_struct *prev, struct rq_flags *rf)
 	/* The running task is never eligible for pushing */
 	dequeue_pushable_task(rq, p);
 
-	queue_push_tasks(rq);
+	rt_queue_push_tasks(rq);
 
 	return p;
 }
@@ -2185,7 +2185,7 @@ static void switched_from_rt(struct rq *rq, struct task_struct *p)
 	if (!task_on_rq_queued(p) || rq->rt.rt_nr_running)
 		return;
 
-	queue_pull_task(rq);
+	rt_queue_pull_task(rq);
 }
 
 void __init init_sched_rt_class(void)
@@ -2216,7 +2216,7 @@ static void switched_to_rt(struct rq *rq, struct task_struct *p)
 	if (task_on_rq_queued(p) && rq->curr != p) {
 #ifdef CONFIG_SMP
 		if (p->nr_cpus_allowed > 1 && rq->rt.overloaded)
-			queue_push_tasks(rq);
+			rt_queue_push_tasks(rq);
 #endif /* CONFIG_SMP */
 		if (p->prio < rq->curr->prio && cpu_online(cpu_of(rq)))
 			resched_curr(rq);
@@ -2240,7 +2240,7 @@ prio_changed_rt(struct rq *rq, struct task_struct *p, int oldprio)
 		 * may need to pull tasks to this runqueue.
 		 */
 		if (oldprio < p->prio)
-			queue_pull_task(rq);
+			rt_queue_pull_task(rq);
 
 		/*
 		 * If there's a higher priority task waiting to run

Original file line number	Diff line number	Diff line change
`@@ -511,15 +511,15 @@ static DEFINE_PER_CPU(struct callback_head, dl_pull_head);`
`511`	`511`	`static void push_dl_tasks(struct rq *);`
`512`	`512`	`static void pull_dl_task(struct rq *);`
`513`	`513`
`514`		`-static inline void queue_push_tasks(struct rq *rq)`
	`514`	`+static inline void deadline_queue_push_tasks(struct rq *rq)`
`515`	`515`	`{`
`516`	`516`	`if (!has_pushable_dl_tasks(rq))`
`517`	`517`	`return;`
`518`	`518`
`519`	`519`	`queue_balance_callback(rq, &per_cpu(dl_push_head, rq->cpu), push_dl_tasks);`
`520`	`520`	`}`
`521`	`521`
`522`		`-static inline void queue_pull_task(struct rq *rq)`
	`522`	`+static inline void deadline_queue_pull_task(struct rq *rq)`
`523`	`523`	`{`
`524`	`524`	`queue_balance_callback(rq, &per_cpu(dl_pull_head, rq->cpu), pull_dl_task);`
`525`	`525`	`}`
`@@ -594,11 +594,11 @@ static inline void pull_dl_task(struct rq *rq)`
`594`	`594`	`{`
`595`	`595`	`}`
`596`	`596`
`597`		`-static inline void queue_push_tasks(struct rq *rq)`
	`597`	`+static inline void deadline_queue_push_tasks(struct rq *rq)`
`598`	`598`	`{`
`599`	`599`	`}`
`600`	`600`
`601`		`-static inline void queue_pull_task(struct rq *rq)`
	`601`	`+static inline void deadline_queue_pull_task(struct rq *rq)`
`602`	`602`	`{`
`603`	`603`	`}`
`604`	`604`	`#endif /* CONFIG_SMP */`
`@@ -1759,7 +1759,7 @@ pick_next_task_dl(struct rq rq, struct task_struct prev, struct rq_flags *rf)`
`1759`	`1759`	`if (hrtick_enabled(rq))`
`1760`	`1760`	`start_hrtick_dl(rq, p);`
`1761`	`1761`
`1762`		`- queue_push_tasks(rq);`
	`1762`	`+ deadline_queue_push_tasks(rq);`
`1763`	`1763`
`1764`	`1764`	`return p;`
`1765`	`1765`	`}`
`@@ -2309,7 +2309,7 @@ static void switched_from_dl(struct rq rq, struct task_struct p)`
`2309`	`2309`	`if (!task_on_rq_queued(p) \|\| rq->dl.dl_nr_running)`
`2310`	`2310`	`return;`
`2311`	`2311`
`2312`		`- queue_pull_task(rq);`
	`2312`	`+ deadline_queue_pull_task(rq);`
`2313`	`2313`	`}`
`2314`	`2314`
`2315`	`2315`	`/*`
`@@ -2331,7 +2331,7 @@ static void switched_to_dl(struct rq rq, struct task_struct p)`
`2331`	`2331`	`if (rq->curr != p) {`
`2332`	`2332`	`#ifdef CONFIG_SMP`
`2333`	`2333`	`if (p->nr_cpus_allowed > 1 && rq->dl.overloaded)`
`2334`		`- queue_push_tasks(rq);`
	`2334`	`+ deadline_queue_push_tasks(rq);`
`2335`	`2335`	`#endif`
`2336`	`2336`	`if (dl_task(rq->curr))`
`2337`	`2337`	`check_preempt_curr_dl(rq, p, 0);`
`@@ -2356,7 +2356,7 @@ static void prio_changed_dl(struct rq rq, struct task_struct p,`
`2356`	`2356`	`* or lowering its prio, so...`
`2357`	`2357`	`*/`
`2358`	`2358`	`if (!rq->dl.overloaded)`
`2359`		`- queue_pull_task(rq);`
	`2359`	`+ deadline_queue_pull_task(rq);`
`2360`	`2360`
`2361`	`2361`	`/*`
`2362`	`2362`	`* If we now have a earlier deadline task than p,`
Original file line number	Diff line number	Diff line change
`@@ -355,15 +355,15 @@ static DEFINE_PER_CPU(struct callback_head, rt_pull_head);`
`355`	`355`	`static void push_rt_tasks(struct rq *);`
`356`	`356`	`static void pull_rt_task(struct rq *);`
`357`	`357`
`358`		`-static inline void queue_push_tasks(struct rq *rq)`
	`358`	`+static inline void rt_queue_push_tasks(struct rq *rq)`
`359`	`359`	`{`
`360`	`360`	`if (!has_pushable_tasks(rq))`
`361`	`361`	`return;`
`362`	`362`
`363`	`363`	`queue_balance_callback(rq, &per_cpu(rt_push_head, rq->cpu), push_rt_tasks);`
`364`	`364`	`}`
`365`	`365`
`366`		`-static inline void queue_pull_task(struct rq *rq)`
	`366`	`+static inline void rt_queue_pull_task(struct rq *rq)`
`367`	`367`	`{`
`368`	`368`	`queue_balance_callback(rq, &per_cpu(rt_pull_head, rq->cpu), pull_rt_task);`
`369`	`369`	`}`
`@@ -421,7 +421,7 @@ static inline void pull_rt_task(struct rq *this_rq)`
`421`	`421`	`{`
`422`	`422`	`}`
`423`	`423`
`424`		`-static inline void queue_push_tasks(struct rq *rq)`
	`424`	`+static inline void rt_queue_push_tasks(struct rq *rq)`
`425`	`425`	`{`
`426`	`426`	`}`
`427`	`427`	`#endif /* CONFIG_SMP */`
`@@ -1565,7 +1565,7 @@ pick_next_task_rt(struct rq rq, struct task_struct prev, struct rq_flags *rf)`
`1565`	`1565`	`/* The running task is never eligible for pushing */`
`1566`	`1566`	`dequeue_pushable_task(rq, p);`
`1567`	`1567`
`1568`		`- queue_push_tasks(rq);`
	`1568`	`+ rt_queue_push_tasks(rq);`
`1569`	`1569`
`1570`	`1570`	`return p;`
`1571`	`1571`	`}`
`@@ -2185,7 +2185,7 @@ static void switched_from_rt(struct rq rq, struct task_struct p)`
`2185`	`2185`	`if (!task_on_rq_queued(p) \|\| rq->rt.rt_nr_running)`
`2186`	`2186`	`return;`
`2187`	`2187`
`2188`		`- queue_pull_task(rq);`
	`2188`	`+ rt_queue_pull_task(rq);`
`2189`	`2189`	`}`
`2190`	`2190`
`2191`	`2191`	`void __init init_sched_rt_class(void)`
`@@ -2216,7 +2216,7 @@ static void switched_to_rt(struct rq rq, struct task_struct p)`
`2216`	`2216`	`if (task_on_rq_queued(p) && rq->curr != p) {`
`2217`	`2217`	`#ifdef CONFIG_SMP`
`2218`	`2218`	`if (p->nr_cpus_allowed > 1 && rq->rt.overloaded)`
`2219`		`- queue_push_tasks(rq);`
	`2219`	`+ rt_queue_push_tasks(rq);`
`2220`	`2220`	`#endif /* CONFIG_SMP */`
`2221`	`2221`	`if (p->prio < rq->curr->prio && cpu_online(cpu_of(rq)))`
`2222`	`2222`	`resched_curr(rq);`
`@@ -2240,7 +2240,7 @@ prio_changed_rt(struct rq rq, struct task_struct p, int oldprio)`
`2240`	`2240`	`* may need to pull tasks to this runqueue.`
`2241`	`2241`	`*/`
`2242`	`2242`	`if (oldprio < p->prio)`
`2243`		`- queue_pull_task(rq);`
	`2243`	`+ rt_queue_pull_task(rq);`
`2244`	`2244`
`2245`	`2245`	`/*`
`2246`	`2246`	`* If there's a higher priority task waiting to run`