---

yaml --- r: 43991 b: refs/heads/master c: 62ab616 h: refs/heads/master i: 43989: 4afd97b 43987: 9e3ed44 43983: af0ae3d v: v3
git-mirror · Dec 10, 2006 · 291ca6c · 291ca6c
1 parent 5cb7b8b
commit 291ca6c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06066714f6016cffcb249f6ab21b7919de1bc859
+refs/heads/master: 62ab616d54371a65f595c199aad1e1755b837d25
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -940,6 +940,9 @@ static void activate_task(struct task_struct *p, struct rq *rq, int local)
 {
 	unsigned long long now;
 
+	if (rt_task(p))
+		goto out;
+
 	now = sched_clock();
 #ifdef CONFIG_SMP
 	if (!local) {
@@ -961,8 +964,7 @@ static void activate_task(struct task_struct *p, struct rq *rq, int local)
 				     (now - p->timestamp) >> 20);
 	}
 
-	if (!rt_task(p))
-		p->prio = recalc_task_prio(p, now);
+	p->prio = recalc_task_prio(p, now);
 
 	/*
 	 * This checks to make sure it's not an uninterruptible task
@@ -987,7 +989,7 @@ static void activate_task(struct task_struct *p, struct rq *rq, int local)
 		}
 	}
 	p->timestamp = now;
-
+out:
 	__activate_task(p, rq);
 }