From: Suresh Siddha Date: Mon, 23 Aug 2010 20:42:51 +0000 (-0700) Subject: sched: Move sched_avg_update() to update_cpu_load() X-Git-Tag: v2.6.34.10~166 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6043c01d813bc3fc21a289461a1a75082516d49b;p=karo-tx-linux.git 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 Signed-off-by: Peter Zijlstra LKML-Reference: <1282596171.2694.3.camel@sbsiddha-MOBL3> Signed-off-by: Ingo Molnar Signed-off-by: Paul Gortmaker --- 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;