diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-06-25 21:08:41 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-06-25 21:08:41 +0200 |
| commit | 5cdeab06fe5b553185040d125da74b12f5ac6442 (patch) | |
| tree | 91f2012fa4a7f13f4f6e87e13e5c854fea251fe4 /target/linux/patches/2.6.30/mips-delay-fix.patch | |
| parent | c98552118a8925f3927056294418543cdba736f7 (diff) | |
| parent | 6f58e88ce0c721c8954898f81c9fbf8088fcba13 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/linux/patches/2.6.30/mips-delay-fix.patch')
| -rw-r--r-- | target/linux/patches/2.6.30/mips-delay-fix.patch | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/target/linux/patches/2.6.30/mips-delay-fix.patch b/target/linux/patches/2.6.30/mips-delay-fix.patch index bb99f1df6..128ed54ec 100644 --- a/target/linux/patches/2.6.30/mips-delay-fix.patch +++ b/target/linux/patches/2.6.30/mips-delay-fix.patch @@ -1,11 +1,27 @@ -diff -Nur linux-2.6.30.orig/arch/mips/lib/delay.c linux-2.6.30/arch/mips/lib/delay.c ---- linux-2.6.30.orig/arch/mips/lib/delay.c 2009-06-10 05:05:27.000000000 +0200 -+++ linux-2.6.30/arch/mips/lib/delay.c 2009-06-12 19:11:07.000000000 +0200 -@@ -51,6 +51,6 @@ +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 * 0x00000005 * HZ * lpj) >> 32); ++ __delay((ns * 0x00000005ull * HZ * lpj) >> 32); } EXPORT_SYMBOL(__ndelay); |