From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 25 Sep 2009 08:01:19 +0000 (+0200)
Subject: kernel-headers: 2.6.30.x: fix build error in ndelay() on mips
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5eb68019cdc97eb032905785ff666063f817cceb;p=buildroot.git

kernel-headers: 2.6.30.x: fix build error in ndelay() on mips

Reported by Dominic Mason <dominic@opusvl.com>.

From mainline 3cb3a66cf7559d9c.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---

diff --git a/toolchain/kernel-headers/linux-2.6.30.8-mips-delay.patch b/toolchain/kernel-headers/linux-2.6.30.8-mips-delay.patch
new file mode 100644
index 0000000000..9e13c2c068
--- /dev/null
+++ b/toolchain/kernel-headers/linux-2.6.30.8-mips-delay.patch
@@ -0,0 +1,35 @@
+From 3cb3a66cf7559d9c5d47ddf58481530b8943052f Mon Sep 17 00:00:00 2001
+From: Atsushi Nemoto <nemoto@toshiba-tops.co.jp>
+Date: Tue, 9 Jun 2009 11:12:48 +0900
+Subject: [PATCH] MIPS: Fix __ndelay build error and add 'ull' suffix for 32-bit kernel
+
+Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
+Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
+---
+ 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);
+-- 
+1.6.3.3
+