From 35a26e54eeb772489fd243f01ed50c4c399fc4a3 Mon Sep 17 00:00:00 2001
From: Vincent Guittot <vincent.guittot@linaro.org>
Date: Thu, 13 Sep 2012 06:11:26 +0200
Subject: [PATCH] --- yaml --- r: 323930 b: refs/heads/master c:
 5ed4f1d96deee82ee92cd1ac1e0108c27e80e9b0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index bd1c9035e919..f13b549bb303 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38b8dd6f87398524d02c21ff614c507ba8c9d295
+refs/heads/master: 5ed4f1d96deee82ee92cd1ac1e0108c27e80e9b0
diff --git a/trunk/kernel/sched/fair.c b/trunk/kernel/sched/fair.c
index 1ca4fe423528..9ae3a5b68ba4 100644
--- a/trunk/kernel/sched/fair.c
+++ b/trunk/kernel/sched/fair.c
@@ -4794,14 +4794,15 @@ static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle)
 		if (need_resched())
 			break;
 
-		raw_spin_lock_irq(&this_rq->lock);
-		update_rq_clock(this_rq);
-		update_idle_cpu_load(this_rq);
-		raw_spin_unlock_irq(&this_rq->lock);
+		rq = cpu_rq(balance_cpu);
+
+		raw_spin_lock_irq(&rq->lock);
+		update_rq_clock(rq);
+		update_idle_cpu_load(rq);
+		raw_spin_unlock_irq(&rq->lock);
 
 		rebalance_domains(balance_cpu, CPU_IDLE);
 
-		rq = cpu_rq(balance_cpu);
 		if (time_after(this_rq->next_balance, rq->next_balance))
 			this_rq->next_balance = rq->next_balance;
 	}