summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-10-06 07:58:01 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-10-06 07:58:01 -0700
commitc7f5d36a3cc26e5068f4444aa22c4579e5eac85f (patch)
tree42f87d43c289127945d45ba4e1c082fdcba60f68 /arch/arm
parenta6930aaee06755d1bdcfd943fbf614e4d92bb0c7 (diff)
parentfb833b1fbb68461772dbf5e91bddea5e839187e9 (diff)
downloadlinux-c7f5d36a3cc26e5068f4444aa22c4579e5eac85f.tar.bz2
Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM fix from Russell King: "A 5% error in delay calculation was introduced during the last merge window, which had gone un-noticed until yesterday" * 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm: ARM: fix delays
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/include/asm/delay.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/delay.h b/arch/arm/include/asm/delay.h
index b7a428154355..b1ce037e4380 100644
--- a/arch/arm/include/asm/delay.h
+++ b/arch/arm/include/asm/delay.h
@@ -10,7 +10,7 @@
#include <asm/param.h> /* HZ */
#define MAX_UDELAY_MS 2
-#define UDELAY_MULT UL(2047 * HZ + 483648 * HZ / 1000000)
+#define UDELAY_MULT UL(2147 * HZ + 483648 * HZ / 1000000)
#define UDELAY_SHIFT 31
#ifndef __ASSEMBLY__