1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-15 10:43:43 +02:00
openwrt-xburst/target/linux/generic-2.6/patches-2.6.30/024-mips_delay.patch
hauke 0b54fe6a54 [kernel] refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16444 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-06-14 09:45:26 +00:00

28 lines
793 B
Diff

From: Atsushi Nemoto <nemoto@toshiba-tops.co.jp>
Subject: [PATCH] fix __ndelay build error and add 'ull' suffix for 32-bit kernel
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
---
arch/mips/lib/delay.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
--- 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);