diff options
| author | Mike Galbraith <efault@gmx.de> | 2006-04-10 22:52:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-11 06:18:30 -0700 |
| commit | 8a5bc075b8d8cf7a87b3f08fad2fba0f5d13295e (patch) | |
| tree | 977c14c704c44a905014ff9b3c0f613983793109 /kernel | |
| parent | 5ce74abe788a26698876e66b9c9ce7e7acc25413 (diff) | |
| download | talos-op-linux-8a5bc075b8d8cf7a87b3f08fad2fba0f5d13295e.tar.gz talos-op-linux-8a5bc075b8d8cf7a87b3f08fad2fba0f5d13295e.zip | |
[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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 2e8a146dd066..365f0b90b4de 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++; |
