[PATCH] sched: don't awaken RT tasks on expired array

[linux-2.6-omap-h63xx.git] / kernel / sched.c

diff --git a/kernel/sched.c b/kernel/sched.c
index 2e8a146dd0660a8e8a914ee0936e66832934b33d..365f0b90b4de534b628acb871ace309491672690 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -713,7 +713,7 @@ static void __activate_task(task_t *p, runqueue_t *rq)
 {
        prio_array_t *target = rq->active;
 
-       if (unlikely(batch_task(p) || expired_starving(rq)))
+       if (unlikely(batch_task(p) || (expired_starving(rq) && !rt_task(p))))
                target = rq->expired;
        enqueue_task(p, target);
        rq->nr_running++;