From f18f19d6a59974f5a92a4f52c0539c2ec3da4f96 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 19 Jun 2009 11:43:28 +0200 Subject: fix broken patch, now rb532 boots fine and fast --- target/linux/patches/2.6.30/mips-delay-fix.patch | 26 +++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) (limited to 'target/linux/patches/2.6.30') 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 +Subject: [PATCH] fix __ndelay build error and add 'ull' suffix for 32-bit kernel + +Signed-off-by: Atsushi Nemoto +--- + 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); -- cgit v1.2.3