Merge branch 'master' of git+ssh://openadk.org/git/openadk
[openadk.git] / target / linux / patches / 2.6.30 / mips-delay-fix.patch
blob128ed54ecb267056f178c5c4d2d03abc47daad91
1 From: Atsushi Nemoto <nemoto@toshiba-tops.co.jp>
2 Subject: [PATCH] fix __ndelay build error and add 'ull' suffix for 32-bit kernel
4 Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
5 ---
6 arch/mips/lib/delay.c | 4 ++--
7 1 files changed, 2 insertions(+), 2 deletions(-)
9 --- a/arch/mips/lib/delay.c
10 +++ b/arch/mips/lib/delay.c
11 @@ -43,7 +43,7 @@ void __udelay(unsigned long us)
13 unsigned int lpj = current_cpu_data.udelay_val;
15 - __delay((us * 0x000010c7 * HZ * lpj) >> 32);
16 + __delay((us * 0x000010c7ull * HZ * lpj) >> 32);
18 EXPORT_SYMBOL(__udelay);
20 @@ -51,6 +51,6 @@ void __ndelay(unsigned long ns)
22 unsigned int lpj = current_cpu_data.udelay_val;
24 - __delay((us * 0x00000005 * HZ * lpj) >> 32);
25 + __delay((ns * 0x00000005ull * HZ * lpj) >> 32);
27 EXPORT_SYMBOL(__ndelay);