diff --git a/kernel/sched.c b/kernel/sched.c index 66e44b5b53d279d7dc406d546cd4295b261cfa84..48e35c9163263cc1c7813a715ddfcf32f8dff31f 100644 --- a/kernel/sched.c +++ b/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); }