diff options
author | Yong Zhang <yong.zhang0@gmail.com> | 2010-02-09 14:43:59 -0500 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2010-12-13 15:02:46 -0500 |
commit | 33c3d6c61debcc0d295fe65521cfbc45409936c7 (patch) | |
tree | c45c932a3229f288a70cdd7d7dde6a8a01e4db48 | |
parent | 6313e3c21743cc88bb5bd8aa72948ee1e83937b6 (diff) |
sched: Cleanup pre_schedule_rt
Since [commit 9a897c5a:
sched: RT-balance, replace hooks with pre/post schedule and wakeup methods]
we must call pre_schedule_rt if prev is rt task.
So condition rt_task(prev) is always true and the 'unlikely' declaration is
simply incorrect.
Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r-- | kernel/sched_rt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c index bea7d79f7e9c..1ab66a227b51 100644 --- a/kernel/sched_rt.c +++ b/kernel/sched_rt.c | |||
@@ -1474,7 +1474,7 @@ skip: | |||
1474 | static void pre_schedule_rt(struct rq *rq, struct task_struct *prev) | 1474 | static void pre_schedule_rt(struct rq *rq, struct task_struct *prev) |
1475 | { | 1475 | { |
1476 | /* Try to pull RT tasks here if we lower this rq's prio */ | 1476 | /* Try to pull RT tasks here if we lower this rq's prio */ |
1477 | if (unlikely(rt_task(prev)) && rq->rt.highest_prio.curr > prev->prio) | 1477 | if (rq->rt.highest_prio.curr > prev->prio) |
1478 | pull_rt_task(rq); | 1478 | pull_rt_task(rq); |
1479 | } | 1479 | } |
1480 | 1480 | ||