diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-06-03 10:27:47 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-06-03 10:27:47 +0200 |
| commit | e197f094b7da7d94812492cfcd706d143f1020e5 (patch) | |
| tree | c9f3394ce9ff51dd325708f7b14f4115ed60b944 /kernel/sched_rt.c | |
| parent | f339b9dc1f03591761d5d930800db24bc0eda1e1 (diff) | |
| parent | e69c634190dc724ef2d845ace8d783031d3e492e (diff) | |
| download | linux-e197f094b7da7d94812492cfcd706d143f1020e5.tar.gz linux-e197f094b7da7d94812492cfcd706d143f1020e5.tar.bz2 linux-e197f094b7da7d94812492cfcd706d143f1020e5.zip | |
Merge branch 'unlikely/sched' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into sched/urgent
Diffstat (limited to 'kernel/sched_rt.c')
| -rw-r--r-- | kernel/sched_rt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c index 88725c939e0b..08e937496b24 100644 --- a/kernel/sched_rt.c +++ b/kernel/sched_rt.c @@ -1126,7 +1126,7 @@ static struct task_struct *_pick_next_task_rt(struct rq *rq) 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)) @@ -1544,7 +1544,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); } |