From: Jan H. Schönherr <schnhrr@cs.tu-berlin.de>
Date: Mon, 1 Aug 2011 09:03:28 +0000 (+0200)
Subject: sched: Remove rq->avg_load_per_task
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e2b245f89ee3f5b03fb42d843a79a58cf4773181;p=openwrt%2Fstaging%2Fblogic.git

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>
---

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 {
 	int cpu;
 	int online;
 
-	unsigned long avg_load_per_task;
-
 	u64 rt_avg;
 	u64 age_stamp;
 	u64 idle_stamp;
@@ -1569,11 +1567,9 @@ static unsigned long cpu_avg_load_per_task(int cpu)
 	unsigned long nr_running = ACCESS_ONCE(rq->nr_running);
 
 	if (nr_running)
-		rq->avg_load_per_task = rq->load.weight / nr_running;
-	else
-		rq->avg_load_per_task = 0;
+		return rq->load.weight / nr_running;
 
-	return rq->avg_load_per_task;
+	return 0;
 }
 
 #ifdef CONFIG_PREEMPT