linux-2.6.30.9-mips-delay.patch 1.0 KB

1234567891011121314151617181920212223242526272829303132333435
  1. From 3cb3a66cf7559d9c5d47ddf58481530b8943052f Mon Sep 17 00:00:00 2001
  2. From: Atsushi Nemoto <nemoto@toshiba-tops.co.jp>
  3. Date: Tue, 9 Jun 2009 11:12:48 +0900
  4. Subject: [PATCH] MIPS: Fix __ndelay build error and add 'ull' suffix for 32-bit kernel
  5. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
  6. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  7. ---
  8. arch/mips/lib/delay.c | 4 ++--
  9. 1 files changed, 2 insertions(+), 2 deletions(-)
  10. diff --git a/arch/mips/lib/delay.c b/arch/mips/lib/delay.c
  11. index f69c6b5..6b3b1de 100644
  12. --- a/arch/mips/lib/delay.c
  13. +++ b/arch/mips/lib/delay.c
  14. @@ -43,7 +43,7 @@ void __udelay(unsigned long us)
  15. {
  16. unsigned int lpj = current_cpu_data.udelay_val;
  17. - __delay((us * 0x000010c7 * HZ * lpj) >> 32);
  18. + __delay((us * 0x000010c7ull * HZ * lpj) >> 32);
  19. }
  20. EXPORT_SYMBOL(__udelay);
  21. @@ -51,6 +51,6 @@ void __ndelay(unsigned long ns)
  22. {
  23. unsigned int lpj = current_cpu_data.udelay_val;
  24. - __delay((us * 0x00000005 * HZ * lpj) >> 32);
  25. + __delay((ns * 0x00000005ull * HZ * lpj) >> 32);
  26. }
  27. EXPORT_SYMBOL(__ndelay);
  28. --
  29. 1.6.3.3