|
@@ -355,7 +355,7 @@ 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;
|
|
@@ -363,7 +363,7 @@ static inline void queue_push_tasks(struct rq *rq)
|
|
|
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
|