diff options
author | Atsushi Nemoto <nemoto@toshiba-tops.co.jp> | 2009-06-08 22:12:48 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2009-06-17 06:06:24 -0400 |
commit | 3cb3a66cf7559d9c5d47ddf58481530b8943052f (patch) | |
tree | 3a5f4868d84e895536794ea61b25f503b8f5456e /arch/mips/lib | |
parent | dbc1d911b4392982d5ec69eaed6b617758a148d9 (diff) |
MIPS: Fix __ndelay build error and add 'ull' suffix for 32-bit kernel
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/lib')
-rw-r--r-- | arch/mips/lib/delay.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/lib/delay.c b/arch/mips/lib/delay.c index f69c6b569eb3..6b3b1de9dcae 100644 --- a/arch/mips/lib/delay.c +++ b/arch/mips/lib/delay.c | |||
@@ -43,7 +43,7 @@ void __udelay(unsigned long us) | |||
43 | { | 43 | { |
44 | unsigned int lpj = current_cpu_data.udelay_val; | 44 | unsigned int lpj = current_cpu_data.udelay_val; |
45 | 45 | ||
46 | __delay((us * 0x000010c7 * HZ * lpj) >> 32); | 46 | __delay((us * 0x000010c7ull * HZ * lpj) >> 32); |
47 | } | 47 | } |
48 | EXPORT_SYMBOL(__udelay); | 48 | EXPORT_SYMBOL(__udelay); |
49 | 49 | ||
@@ -51,6 +51,6 @@ void __ndelay(unsigned long ns) | |||
51 | { | 51 | { |
52 | unsigned int lpj = current_cpu_data.udelay_val; | 52 | unsigned int lpj = current_cpu_data.udelay_val; |
53 | 53 | ||
54 | __delay((us * 0x00000005 * HZ * lpj) >> 32); | 54 | __delay((ns * 0x00000005ull * HZ * lpj) >> 32); |
55 | } | 55 | } |
56 | EXPORT_SYMBOL(__ndelay); | 56 | EXPORT_SYMBOL(__ndelay); |