From: Mike Galbraith <efault@gmx.de>
Date: Tue, 11 Apr 2006 05:52:45 +0000 (-0700)
Subject: [PATCH] sched: don't awaken RT tasks on expired array
X-Git-Tag: v2.6.17-rc2~276
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a5bc075b8d8cf7a87b3f08fad2fba0f5d13295e;p=linux-2.6

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

diff --git a/kernel/sched.c b/kernel/sched.c
index 2e8a146dd0..365f0b90b4 100644
--- 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++;