]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] sched: account rt tasks in prio_bias()
authorCon Kolivas <kernel@kolivas.org>
Wed, 9 Nov 2005 05:38:57 +0000 (21:38 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 9 Nov 2005 15:56:32 +0000 (07:56 -0800)
Real time tasks' effect on prio_bias should be based on their real time
priority level instead of their static_prio which is based on nice.

Signed-off-by: Con Kolivas <kernel@kolivas.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
kernel/sched.c

index e1f57bd5aaa6a33d729cd161f54bedf2039d1c42..d9dbf8ee6ca4be3dd119567afbdc636a08465995 100644 (file)
@@ -661,21 +661,21 @@ static int effective_prio(task_t *p)
 }
 
 #ifdef CONFIG_SMP
-static inline void inc_prio_bias(runqueue_t *rq, int static_prio)
+static inline void inc_prio_bias(runqueue_t *rq, int prio)
 {
-       rq->prio_bias += MAX_PRIO - static_prio;
+       rq->prio_bias += MAX_PRIO - prio;
 }
 
-static inline void dec_prio_bias(runqueue_t *rq, int static_prio)
+static inline void dec_prio_bias(runqueue_t *rq, int prio)
 {
-       rq->prio_bias -= MAX_PRIO - static_prio;
+       rq->prio_bias -= MAX_PRIO - prio;
 }
 #else
-static inline void inc_prio_bias(runqueue_t *rq, int static_prio)
+static inline void inc_prio_bias(runqueue_t *rq, int prio)
 {
 }
 
-static inline void dec_prio_bias(runqueue_t *rq, int static_prio)
+static inline void dec_prio_bias(runqueue_t *rq, int prio)
 {
 }
 #endif
@@ -683,13 +683,19 @@ static inline void dec_prio_bias(runqueue_t *rq, int static_prio)
 static inline void inc_nr_running(task_t *p, runqueue_t *rq)
 {
        rq->nr_running++;
-       inc_prio_bias(rq, p->static_prio);
+       if (rt_task(p))
+               inc_prio_bias(rq, p->prio);
+       else
+               inc_prio_bias(rq, p->static_prio);
 }
 
 static inline void dec_nr_running(task_t *p, runqueue_t *rq)
 {
        rq->nr_running--;
-       dec_prio_bias(rq, p->static_prio);
+       if (rt_task(p))
+               dec_prio_bias(rq, p->prio);
+       else
+               dec_prio_bias(rq, p->static_prio);
 }
 
 /*