target/linux/generic-2.6/patches-2.6.30/024-mips_delay.patch

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