aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sched.c
diff options
context:
space:
mode:
authorJan H. Schönherr <schnhrr@cs.tu-berlin.de>2011-08-01 05:03:28 -0400
committerIngo Molnar <mingo@elte.hu>2011-08-14 05:55:24 -0400
commite2b245f89ee3f5b03fb42d843a79a58cf4773181 (patch)
tree3e20888a72b6750701b6c3b35edc74b4310aa7f6 /kernel/sched.c
parenteeca7360f756f7e36e846f35018df20808c7ef63 (diff)
sched: Remove rq->avg_load_per_task
Since commit a2d47777 ("sched: fix stale value in average load per task") the variable rq->avg_load_per_task is no longer required. Remove it. Signed-off-by: Jan H. Schönherr <schnhrr@cs.tu-berlin.de> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1312189408-17172-1-git-send-email-schnhrr@cs.tu-berlin.de Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/sched.c')
-rw-r--r--kernel/sched.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index ccacdbdecf45..b1e8f0eca1f9 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -520,8 +520,6 @@ struct rq {
520 int cpu; 520 int cpu;
521 int online; 521 int online;
522 522
523 unsigned long avg_load_per_task;
524
525 u64 rt_avg; 523 u64 rt_avg;
526 u64 age_stamp; 524 u64 age_stamp;
527 u64 idle_stamp; 525 u64 idle_stamp;
@@ -1569,11 +1567,9 @@ static unsigned long cpu_avg_load_per_task(int cpu)
1569 unsigned long nr_running = ACCESS_ONCE(rq->nr_running); 1567 unsigned long nr_running = ACCESS_ONCE(rq->nr_running);
1570 1568
1571 if (nr_running) 1569 if (nr_running)
1572 rq->avg_load_per_task = rq->load.weight / nr_running; 1570 return rq->load.weight / nr_running;
1573 else
1574 rq->avg_load_per_task = 0;
1575 1571
1576 return rq->avg_load_per_task; 1572 return 0;
1577} 1573}
1578 1574
1579#ifdef CONFIG_PREEMPT 1575#ifdef CONFIG_PREEMPT