diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-06 10:58:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-06 10:58:01 -0400 |
| commit | c7f5d36a3cc26e5068f4444aa22c4579e5eac85f (patch) | |
| tree | 42f87d43c289127945d45ba4e1c082fdcba60f68 | |
| parent | a6930aaee06755d1bdcfd943fbf614e4d92bb0c7 (diff) | |
| parent | fb833b1fbb68461772dbf5e91bddea5e839187e9 (diff) | |
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
| -rw-r--r-- | arch/arm/include/asm/delay.h | 2 |
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 @@ | |||
| 10 | #include <asm/param.h> /* HZ */ | 10 | #include <asm/param.h> /* HZ */ |
| 11 | 11 | ||
| 12 | #define MAX_UDELAY_MS 2 | 12 | #define MAX_UDELAY_MS 2 |
| 13 | #define UDELAY_MULT UL(2047 * HZ + 483648 * HZ / 1000000) | 13 | #define UDELAY_MULT UL(2147 * HZ + 483648 * HZ / 1000000) |
| 14 | #define UDELAY_SHIFT 31 | 14 | #define UDELAY_SHIFT 31 |
| 15 | 15 | ||
| 16 | #ifndef __ASSEMBLY__ | 16 | #ifndef __ASSEMBLY__ |