diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-11 07:59:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-11 07:59:49 -0700 |
| commit | aad1830e6b978f5d90e5d81d071e1752f526f732 (patch) | |
| tree | af5ba1a5ce1574201e4b4da0366a19a4149e0f8c /kernel/sched_fair.c | |
| parent | 3e6dce76d99b328716b43929b9195adfee1de00c (diff) | |
| parent | 55496c896b8a695140045099d4e0175cf09d4eae (diff) | |
| download | linux-aad1830e6b978f5d90e5d81d071e1752f526f732.tar.gz linux-aad1830e6b978f5d90e5d81d071e1752f526f732.tar.bz2 linux-aad1830e6b978f5d90e5d81d071e1752f526f732.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:
x86, tsc: Fix a preemption leak in restore_sched_clock_state()
sched: Move sched_avg_update() to update_cpu_load()
Diffstat (limited to 'kernel/sched_fair.c')
| -rw-r--r-- | kernel/sched_fair.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c index 134f7edb30c6..9b5b4f86b742 100644 --- a/kernel/sched_fair.c +++ b/kernel/sched_fair.c @@ -2267,8 +2267,6 @@ unsigned long scale_rt_power(int cpu) struct rq *rq = cpu_rq(cpu); u64 total, available; - sched_avg_update(rq); - total = sched_avg_period() + (rq->clock - rq->age_stamp); available = total - rq->rt_avg; |