[kernel] r13800 - in dists/trunk/linux-2.6/debian/patches: bugfix/mips series

[Martin Michlmayr]

Author: tbm
Date: Sat Jun 13 07:09:46 2009
New Revision: 13800

Log:
fix mips build error

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/mips/fix-ndelay-build-error.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/series/base

Added: dists/trunk/linux-2.6/debian/patches/bugfix/mips/fix-ndelay-build-error.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/mips/fix-ndelay-build-error.patch	Sat Jun 13 07:09:46 2009	(r13800)
@@ -0,0 +1,33 @@
+From: Atsushi Nemoto <nemoto at toshiba-tops.co.jp>
+Date: Tue, 9 Jun 2009 02:12:48 +0000 (+0900)
+Subject: MIPS: Fix __ndelay build error and add 'ull' suffix for 32-bit kernel
+X-Git-Tag: linux-2.6.30~2
+X-Git-Url: http://www.linux-mips.org/git?p=linux.git;a=commitdiff_plain;h=60bd2aaf47ba20fd99901b8bcd2bebffe37b166d
+
+MIPS: Fix __ndelay build error and add 'ull' suffix for 32-bit kernel
+
+Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
+Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
+---
+
+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);

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Fri Jun 12 19:37:12 2009	(r13799)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Sat Jun 13 07:09:46 2009	(r13800)
@@ -36,4 +36,4 @@
 + features/all/bnx2x-Separated-FW-from-the-source.patch
 + features/all/bnx2x-driver-version-1.48.105-1.patch
 - debian/dfsg/drivers-net-bnx2x-disable.patch
-
++ bugfix/mips/fix-ndelay-build-error.patch