diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-06-03 04:27:47 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-06-03 04:27:47 -0400 |
commit | e197f094b7da7d94812492cfcd706d143f1020e5 (patch) | |
tree | c9f3394ce9ff51dd325708f7b14f4115ed60b944 /kernel/sched_rt.c | |
parent | f339b9dc1f03591761d5d930800db24bc0eda1e1 (diff) | |
parent | e69c634190dc724ef2d845ace8d783031d3e492e (diff) |
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) | |||
1126 | 1126 | ||
1127 | rt_rq = &rq->rt; | 1127 | rt_rq = &rq->rt; |
1128 | 1128 | ||
1129 | if (unlikely(!rt_rq->rt_nr_running)) | 1129 | if (!rt_rq->rt_nr_running) |
1130 | return NULL; | 1130 | return NULL; |
1131 | 1131 | ||
1132 | if (rt_rq_throttled(rt_rq)) | 1132 | if (rt_rq_throttled(rt_rq)) |
@@ -1544,7 +1544,7 @@ skip: | |||
1544 | static void pre_schedule_rt(struct rq *rq, struct task_struct *prev) | 1544 | static void pre_schedule_rt(struct rq *rq, struct task_struct *prev) |
1545 | { | 1545 | { |
1546 | /* Try to pull RT tasks here if we lower this rq's prio */ | 1546 | /* Try to pull RT tasks here if we lower this rq's prio */ |
1547 | if (unlikely(rt_task(prev)) && rq->rt.highest_prio.curr > prev->prio) | 1547 | if (rq->rt.highest_prio.curr > prev->prio) |
1548 | pull_rt_task(rq); | 1548 | pull_rt_task(rq); |
1549 | } | 1549 | } |
1550 | 1550 | ||