[PATCH] sched: don't awaken RT tasks on expired array
authorMike Galbraith <efault@gmx.de>
Tue, 11 Apr 2006 05:52:45 +0000 (22:52 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 11 Apr 2006 13:18:30 +0000 (06:18 -0700)
RT tasks are being awakened on the expired array when expired_starving() is
true, whereas they really should be excluded.  Fix.

Signed-off-by: Mike Galbraith <efault@gmx.de>
Acked-by: Ingo Molnar <mingo@elte.hu>
Cc: Con Kolivas <kernel@kolivas.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
kernel/sched.c

index 2e8a146dd0660a8e8a914ee0936e66832934b33d..365f0b90b4de534b628acb871ace309491672690 100644 (file)
@@ -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++;