From: Yong Zhang <yong.zhang0@gmail.com>
Date: Tue, 9 Feb 2010 19:43:59 +0000 (-0500)
Subject: sched: Cleanup pre_schedule_rt
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=33c3d6c61debcc0d295fe65521cfbc45409936c7;p=linux-beck.git

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>
---

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:
 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);
 }