summaryrefslogtreecommitdiffstats
path: root/kernel/sched_rt.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-02-16 13:31:51 +0100
committerIngo Molnar <mingo@elte.hu>2011-02-16 13:31:55 +0100
commit48fa4b8ecf683f5e411303553da9e186e8b8406e (patch)
tree76cec4aa8cca18a44b1bd6e5be68c462a0e66d5f /kernel/sched_rt.c
parentd95f412200652694e63e64bfd49f0ae274a54479 (diff)
parent85e2efbb1db9a18d218006706d6e4fbeb0216213 (diff)
downloadop-kernel-dev-48fa4b8ecf683f5e411303553da9e186e8b8406e.zip
op-kernel-dev-48fa4b8ecf683f5e411303553da9e186e8b8406e.tar.gz
Merge commit 'v2.6.38-rc5' into sched/core
Merge reason: Pick up upstream fixes. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/sched_rt.c')
-rw-r--r--kernel/sched_rt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c
index c381fdc..4e108f8 100644
--- a/kernel/sched_rt.c
+++ b/kernel/sched_rt.c
@@ -625,7 +625,7 @@ static void update_curr_rt(struct rq *rq)
struct rt_rq *rt_rq = rt_rq_of_se(rt_se);
u64 delta_exec;
- if (!task_has_rt_policy(curr))
+ if (curr->sched_class != &rt_sched_class)
return;
delta_exec = rq->clock_task - curr->se.exec_start;
OpenPOWER on IntegriCloud