diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-07 08:44:11 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-07 08:44:26 +0100 |
| commit | c7f9a6f377fa64e5a74f8c128d4349765c28fab1 (patch) | |
| tree | e71eaf08c5f9179d6fd6c7e08d8539358dc76ad1 /kernel/sched_rt.c | |
| parent | fe4b04fa31a6dcf4358aa84cf81e5a7fd079469b (diff) | |
| parent | 8dbdea8444d303a772bceb1ba963f0e3273bfc5e (diff) | |
Merge branch 'linus' into perf/core
Merge reason: Pick up perf fixes that are now upstream
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/sched_rt.c')
| -rw-r--r-- | kernel/sched_rt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c index c914ec747ca..ad6267714c8 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; |