SCHEDULER: minor updates from CAF
/kernel/sched_rt.c
blob:ac79f9e34fd2a877c26aad4cc9268dbd2a6259a0 -> blob:a28fbfb3e535053b89eb52d4d881df0f8d51129b
--- kernel/sched_rt.c
+++ kernel/sched_rt.c
@@ -1126,7 +1126,7 @@ static struct task_struct *_pick_next_ta
rt_rq = &rq->rt;
- if (unlikely(!rt_rq->rt_nr_running))
+ if (!rt_rq->rt_nr_running)
return NULL;
if (rt_rq_throttled(rt_rq))
@@ -1207,7 +1207,7 @@ static struct task_struct *pick_next_hig
next_idx:
if (idx >= MAX_RT_PRIO)
continue;
- if (next && next->prio < idx)
+ if (next && next->prio <= idx)
continue;
list_for_each_entry(rt_se, array->queue + idx, run_list) {
struct task_struct *p;
@@ -1553,7 +1553,7 @@ skip:
static void pre_schedule_rt(struct rq *rq, struct task_struct *prev)
{
/* Try to pull RT tasks here if we lower this rq's prio */
- if (unlikely(rt_task(prev)) && rq->rt.highest_prio.curr > prev->prio)
+ if (rq->rt.highest_prio.curr > prev->prio)
pull_rt_task(rq);
}