diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-03 08:55:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-03 08:55:07 -0800 |
| commit | 49abda98929a100cd6309da8dca29db84c72c721 (patch) | |
| tree | 603e2628d33187467d14c053f7d17d9460e5a7cb /kernel | |
| parent | eb487ab4d5af0caee81bfaaa5d87b55844f60145 (diff) | |
| parent | 06c3bc655697b19521901f9254eb0bbb2c67e7e8 (diff) | |
| download | linux-49abda98929a100cd6309da8dca29db84c72c721.tar.gz linux-49abda98929a100cd6309da8dca29db84c72c721.tar.bz2 linux-49abda98929a100cd6309da8dca29db84c72c721.zip | |
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: Fix update_curr_rt()
sched, docs: Update schedstats documentation to version 15
Diffstat (limited to 'kernel')
| -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 c914ec747ca6..ad6267714c84 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; |