From 634f52ce6ef3899170d8caf2960af9533e08dbab Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Wed, 22 Jun 2011 11:55:50 +0100
Subject: [PATCH] --- yaml --- r: 253967 b: refs/heads/master c:
 1b19ca9f0bdab7d5035821e1ec8f39df9a6e3ee0 h: refs/heads/master i:   253965:
 dacdc13596eb101e7b512cf3138fd43f158683b2   253963:
 a6e89ea721321399ae5423e82265f7272d9bc844   253959:
 dbd85d8e5d0f806e32a3d9f971abce1f2cd1f06d   253951:
 4e3be88dcd25217b81921c50ca0fde15b74eef3d v: v3

---
 [refs]                 |  2 +-
 trunk/init/calibrate.c | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 271b3b4f6ad7..d86cb2c133ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33b1e6939f5c37ab8e64280fd3d54046607b5c80
+refs/heads/master: 1b19ca9f0bdab7d5035821e1ec8f39df9a6e3ee0
diff --git a/trunk/init/calibrate.c b/trunk/init/calibrate.c
index 2568d22a304e..aae2f40fea4c 100644
--- a/trunk/init/calibrate.c
+++ b/trunk/init/calibrate.c
@@ -245,30 +245,32 @@ static unsigned long __cpuinit calibrate_delay_converge(void)
 
 void __cpuinit calibrate_delay(void)
 {
+	unsigned long lpj;
 	static bool printed;
 
 	if (preset_lpj) {
-		loops_per_jiffy = preset_lpj;
+		lpj = preset_lpj;
 		if (!printed)
 			pr_info("Calibrating delay loop (skipped) "
 				"preset value.. ");
 	} else if ((!printed) && lpj_fine) {
-		loops_per_jiffy = lpj_fine;
+		lpj = lpj_fine;
 		pr_info("Calibrating delay loop (skipped), "
 			"value calculated using timer frequency.. ");
-	} else if ((loops_per_jiffy = calibrate_delay_direct()) != 0) {
+	} else if ((lpj = calibrate_delay_direct()) != 0) {
 		if (!printed)
 			pr_info("Calibrating delay using timer "
 				"specific routine.. ");
 	} else {
 		if (!printed)
 			pr_info("Calibrating delay loop... ");
-		loops_per_jiffy = calibrate_delay_converge();
+		lpj = calibrate_delay_converge();
 	}
 	if (!printed)
 		pr_cont("%lu.%02lu BogoMIPS (lpj=%lu)\n",
-			loops_per_jiffy/(500000/HZ),
-			(loops_per_jiffy/(5000/HZ)) % 100, loops_per_jiffy);
+			lpj/(500000/HZ),
+			(lpj/(5000/HZ)) % 100, lpj);
 
+	loops_per_jiffy = lpj;
 	printed = true;
 }