---

yaml --- r: 322637 b: refs/heads/master c: beafa0d h: refs/heads/master i: 322635: fa71cee v: v3
git-mirror · Sep 9, 2012 · 2cbc460 · 2cbc460
1 parent 796d8e4
commit 2cbc460
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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;