Commit 8a5bc075 authored by Mike Galbraith's avatar Mike Galbraith Committed by Linus Torvalds

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

RT tasks are being awakened on the expired array when expired_starving() is
true, whereas they really should be excluded.  Fix.
Signed-off-by: default avatarMike Galbraith <efault@gmx.de>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
Cc: Con Kolivas <kernel@kolivas.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5ce74abe
...@@ -713,7 +713,7 @@ static void __activate_task(task_t *p, runqueue_t *rq) ...@@ -713,7 +713,7 @@ static void __activate_task(task_t *p, runqueue_t *rq)
{ {
prio_array_t *target = rq->active; 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; target = rq->expired;
enqueue_task(p, target); enqueue_task(p, target);
rq->nr_running++; rq->nr_running++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment