diff options
| author | Suresh Siddha <suresh.b.siddha@intel.com> | 2010-08-23 13:42:51 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-09-09 20:39:33 +0200 |
| commit | da2b71edd8a7db44fe1746261410a981f3e03632 (patch) | |
| tree | 4c84c8761590138cffb244eb54fb29263175a6cd /kernel/sched_fair.c | |
| parent | d56557af19867edb8c0e96f8e26399698a08857f (diff) | |
| download | blackbird-op-linux-da2b71edd8a7db44fe1746261410a981f3e03632.tar.gz blackbird-op-linux-da2b71edd8a7db44fe1746261410a981f3e03632.zip | |
sched: Move sched_avg_update() to update_cpu_load()
Currently sched_avg_update() (which updates rt_avg stats in the rq)
is getting called from scale_rt_power() (in the load balance context)
which doesn't take rq->lock.
Fix it by moving the sched_avg_update() to more appropriate
update_cpu_load() where the CFS load gets updated as well.
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1282596171.2694.3.camel@sbsiddha-MOBL3>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 ab661ebc4895..f53ec7550056 100644 --- a/kernel/sched_fair.c +++ b/kernel/sched_fair.c @@ -2268,8 +2268,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; |
