sched: Fix need_resched() when checking peempt
authorHillf Danton <dhillf@gmail.com>
Tue, 14 Jun 2011 22:36:24 +0000 (18:36 -0400)
committerIngo Molnar <mingo@elte.hu>
Wed, 15 Jun 2011 07:50:32 +0000 (09:50 +0200)
The RT preempt check tests the wrong task if NEED_RESCHED is
set. It currently checks the local CPU task. It is supposed to
check the task that is running on the runqueue we are about to
wake another task on.

Signed-off-by: Hillf Danton <dhillf@gmail.com>
Reviewed-by: Yong Zhang <yong.zhang0@gmail.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/20110614223657.450239027@goodmis.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/sched_rt.c

index 88725c939e0b8000253905332db8725507781f48..9b8d5dce946e6babc05d20ce139e09c7403b620a 100644 (file)
@@ -1096,7 +1096,7 @@ static void check_preempt_curr_rt(struct rq *rq, struct task_struct *p, int flag
         * to move current somewhere else, making room for our non-migratable
         * task.
         */
-       if (p->prio == rq->curr->prio && !need_resched())
+       if (p->prio == rq->curr->prio && !test_tsk_need_resched(rq->curr))
                check_preempt_equal_prio(rq, p);
 #endif
 }