| 1 | From: Atsushi Nemoto <nemoto@toshiba-tops.co.jp> |
| 2 | Subject: [PATCH] fix __ndelay build error and add 'ull' suffix for 32-bit kernel |
| 3 | |
| 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(-) |
| 8 | |
| 9 | --- a/arch/mips/lib/delay.c |
| 10 | +++ b/arch/mips/lib/delay.c |
| 11 | @@ -43,7 +43,7 @@ void __udelay(unsigned long us) |
| 12 | { |
| 13 | unsigned int lpj = current_cpu_data.udelay_val; |
| 14 | |
| 15 | - __delay((us * 0x000010c7 * HZ * lpj) >> 32); |
| 16 | + __delay((us * 0x000010c7ull * HZ * lpj) >> 32); |
| 17 | } |
| 18 | EXPORT_SYMBOL(__udelay); |
| 19 | |
| 20 | @@ -51,6 +51,6 @@ void __ndelay(unsigned long ns) |
| 21 | { |
| 22 | unsigned int lpj = current_cpu_data.udelay_val; |
| 23 | |
| 24 | - __delay((us * 0x00000005 * HZ * lpj) >> 32); |
| 25 | + __delay((ns * 0x00000005ull * HZ * lpj) >> 32); |
| 26 | } |
| 27 | EXPORT_SYMBOL(__ndelay); |
| 28 | |
