Merge commit 'v2.6.36-rc5' into sched/core

[mv-sheeva.git] / kernel / sched.c

diff --git a/kernel/sched.c b/kernel/sched.c
index 16a1129f51ec4e85a6c4ce3bbf0daeabe652c1c3..9ca8ad05950bf13d23ea5cc1c2ce266df9bdc9f1 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -1291,6 +1291,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
@@ -3179,6 +3183,8 @@ static void update_cpu_load(struct rq *this_rq)
 
                this_rq->cpu_load[i] = (old_load * (scale - 1) + new_load) >> i;
        }
+
+       sched_avg_update(this_rq);
 }
 
 static void update_cpu_load_active(struct rq *this_rq)