From 291ca6c6b576c541274a15562d0d94baf0cf1d85 Mon Sep 17 00:00:00 2001 From: "Chen, Kenneth W" Date: Sun, 10 Dec 2006 02:20:36 -0800 Subject: [PATCH] --- yaml --- r: 43991 b: refs/heads/master c: 62ab616d54371a65f595c199aad1e1755b837d25 h: refs/heads/master i: 43989: 4afd97b2e1e07dc3407dea7637e938ac00a4ab37 43987: 9e3ed44e2c2f66e72069df1898a1f5dddd64679a 43983: af0ae3d9c31b61a44de2afe1d2fa37d1c4c4b72a v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ef8112b01a70..c6a14258eed4 100644 --- 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 index 66e44b5b53d2..48e35c916326 100644 --- 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); }