]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
MIPS: Fix __ndelay build error and add 'ull' suffix for 32-bit kernel
authorAtsushi Nemoto <nemoto@toshiba-tops.co.jp>
Tue, 9 Jun 2009 02:12:48 +0000 (11:12 +0900)
committerRalf Baechle <ralf@linux-mips.org>
Wed, 17 Jun 2009 10:06:24 +0000 (11:06 +0100)
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/lib/delay.c

index f69c6b569eb3b7c42b4ea756e56f847e7bd75fe2..6b3b1de9dcae9e024fcaa7d8b5e4ef73439543ce 100644 (file)
@@ -43,7 +43,7 @@ void __udelay(unsigned long us)
 {
        unsigned int lpj = current_cpu_data.udelay_val;
 
-       __delay((us * 0x000010c7 * HZ * lpj) >> 32);
+       __delay((us * 0x000010c7ull * HZ * lpj) >> 32);
 }
 EXPORT_SYMBOL(__udelay);
 
@@ -51,6 +51,6 @@ void __ndelay(unsigned long ns)
 {
        unsigned int lpj = current_cpu_data.udelay_val;
 
-       __delay((us * 0x00000005 * HZ * lpj) >> 32);
+       __delay((ns * 0x00000005ull * HZ * lpj) >> 32);
 }
 EXPORT_SYMBOL(__ndelay);