diff options
| author | Hamish Guthrie <hcg@openwrt.org> | 2009-06-10 12:23:55 +0000 |
|---|---|---|
| committer | Hamish Guthrie <hcg@openwrt.org> | 2009-06-10 12:23:55 +0000 |
| commit | 51a8ec85480cc516fbfa9e184b0831db93cbbde1 (patch) | |
| tree | 99d8ef3b7c005f94b3aa308e7c365270823e01e4 /target/linux/generic-2.6/patches-2.6.30/024-mips_delay.patch | |
| parent | 2670ed1229df7fcb2904e7f839141734bd3a0e97 (diff) | |
| download | master-187ad058-51a8ec85480cc516fbfa9e184b0831db93cbbde1.tar.gz master-187ad058-51a8ec85480cc516fbfa9e184b0831db93cbbde1.tar.bz2 master-187ad058-51a8ec85480cc516fbfa9e184b0831db93cbbde1.zip | |
Remove deprecated 023-mips_delay_gcc4.4.0.patch and add new delay fix for MIPS
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16397 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.30/024-mips_delay.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.30/024-mips_delay.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.30/024-mips_delay.patch b/target/linux/generic-2.6/patches-2.6.30/024-mips_delay.patch new file mode 100644 index 0000000000..284f34610f --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.30/024-mips_delay.patch @@ -0,0 +1,32 @@ +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(-) + +diff --git a/arch/mips/lib/delay.c b/arch/mips/lib/delay.c +index f69c6b5..6b3b1de 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); + + + |