From 2cbc460079ce312e86a9633e20a08a2dd67227d0 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Fri, 7 Sep 2012 18:24:53 +0100
Subject: [PATCH] --- yaml --- r: 322637 b: refs/heads/master c:
 beafa0de3d3e0d0ece7638cded879815f359f1cb h: refs/heads/master i:   322635:
 fa71ceeae4ff97a68fcabfec079872b7a17aba3f v: v3

---
 [refs]                     | 2 +-
 trunk/arch/arm/lib/delay.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 49a33dbe80d9..d48770a7a50a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad72907acd2943304c292ae36960bb66e6dc23c9
+refs/heads/master: beafa0de3d3e0d0ece7638cded879815f359f1cb
diff --git a/trunk/arch/arm/lib/delay.c b/trunk/arch/arm/lib/delay.c
index d6dacc69254e..395d5fbb8fa2 100644
--- a/trunk/arch/arm/lib/delay.c
+++ b/trunk/arch/arm/lib/delay.c
@@ -59,6 +59,7 @@ void __init init_current_timer_delay(unsigned long freq)
 {
 	pr_info("Switching to timer-based delay loop\n");
 	lpj_fine			= freq / HZ;
+	loops_per_jiffy			= lpj_fine;
 	arm_delay_ops.delay		= __timer_delay;
 	arm_delay_ops.const_udelay	= __timer_const_udelay;
 	arm_delay_ops.udelay		= __timer_udelay;