diff options
| author | Suresh Siddha <suresh.b.siddha@intel.com> | 2010-08-23 13:42:51 -0700 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-06-26 12:46:38 -0400 |
| commit | 6043c01d813bc3fc21a289461a1a75082516d49b (patch) | |
| tree | 67c298d29e7c492a72b6a82ee5ac74119ca79a33 /kernel | |
| parent | 7c698085033c45d2ab71b62fb6dcdf36a1f55be2 (diff) | |
sched: Move sched_avg_update() to update_cpu_load()
commit da2b71edd8a7db44fe1746261410a981f3e03632 upstream.
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>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched.c | 6 | ||||
| -rw-r--r-- | kernel/sched_fair.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 12ee15615097..c3e891fb0247 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -1269,6 +1269,10 @@ static void resched_task(struct task_struct *p) static void sched_rt_avg_update(struct rq *rq, u64 rt_delta) { } + +static void sched_avg_update(struct rq *rq) +{ +} #endif /* CONFIG_SMP */ #if BITS_PER_LONG == 32 @@ -3102,6 +3106,8 @@ static void update_cpu_load(struct rq *this_rq) this_rq->calc_load_update += LOAD_FREQ; calc_load_account_active(this_rq); } + + sched_avg_update(this_rq); } #ifdef CONFIG_SMP diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c index 72eb9a60787c..3a0f7baa5485 100644 --- a/kernel/sched_fair.c +++ b/kernel/sched_fair.c @@ -2337,8 +2337,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; |