From bee6801ead39b075e0ade8934dbb395a2a1916c1 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 29 Nov 2008 20:45:15 +0100
Subject: [PATCH] --- yaml --- r: 119431 b: refs/heads/master c:
 af6d596fd603219b054c1c90fb16672a9fd441bd h: refs/heads/master i:   119429:
 5d8e724d88375d48872f93a9a4a4f3cd90b4bd5b   119427:
 0081b83874466c735de1cc76a39f21536c39eaea   119423:
 66b6d2521b4ee20dd32675a2c1dd21e00064b682 v: v3

---
 [refs]               | 2 +-
 trunk/kernel/sched.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a374f4842afe..0f971a1fabcd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1583715ddb61f822041807a0f18b3b4845e88c76
+refs/heads/master: af6d596fd603219b054c1c90fb16672a9fd441bd
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 700aa9a1413f..b7480fb5c3dc 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -1453,7 +1453,7 @@ static int task_hot(struct task_struct *p, u64 now, struct sched_domain *sd);
 static unsigned long cpu_avg_load_per_task(int cpu)
 {
 	struct rq *rq = cpu_rq(cpu);
-	unsigned long nr_running = rq->nr_running;
+	unsigned long nr_running = ACCESS_ONCE(rq->nr_running);
 
 	if (nr_running)
 		rq->avg_load_per_task = rq->load.weight / nr_running;