From: Atsushi Nemoto <nemoto@toshiba-tops.co.jp>
Date: Tue, 9 Jun 2009 02:12:48 +0000 (+0900)
Subject: MIPS: Fix __ndelay build error and add 'ull' suffix for 32-bit kernel
X-Git-Tag: v5.15~33571^2~44
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3cb3a66cf7559d9c5d47ddf58481530b8943052f;p=mirror_ubuntu-kernels.git

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>
---

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)
 {
 	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);