diff options
author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2006-04-17 08:24:49 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2006-04-27 10:13:49 -0400 |
commit | 6f8782c4b2ed3cb652f1ad6b6d91890c7f2423ab (patch) | |
tree | 772c02f21ccf4178681d3506888bdda3ff139f4f /arch/mips | |
parent | bc818247203a7bfc40296a3f5b760de84fb8e0d1 (diff) |
[MIPS] Use __ffs() instead of ffs() in ip32_irq0().
With recent rewrite for generic bitops, ffs() is defined the same way
as the libc and compiler built-in routines (returns int instead of
unsigned long). Use __ffs() for 64bit value.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/sgi-ip32/ip32-irq.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/mips/sgi-ip32/ip32-irq.c b/arch/mips/sgi-ip32/ip32-irq.c index 22a6df94b4a1..de01c9815bdd 100644 --- a/arch/mips/sgi-ip32/ip32-irq.c +++ b/arch/mips/sgi-ip32/ip32-irq.c | |||
@@ -507,13 +507,14 @@ static void ip32_irq0(struct pt_regs *regs) | |||
507 | int irq = 0; | 507 | int irq = 0; |
508 | 508 | ||
509 | crime_int = crime->istat & crime_mask; | 509 | crime_int = crime->istat & crime_mask; |
510 | irq = ffs(crime_int); | 510 | irq = __ffs(crime_int); |
511 | crime_int = 1 << (irq - 1); | 511 | crime_int = 1 << irq; |
512 | 512 | ||
513 | if (crime_int & CRIME_MACEISA_INT_MASK) { | 513 | if (crime_int & CRIME_MACEISA_INT_MASK) { |
514 | unsigned long mace_int = mace->perif.ctrl.istat; | 514 | unsigned long mace_int = mace->perif.ctrl.istat; |
515 | irq = ffs(mace_int & maceisa_mask) + 32; | 515 | irq = __ffs(mace_int & maceisa_mask) + 32; |
516 | } | 516 | } |
517 | irq++; | ||
517 | DBG("*irq %u*\n", irq); | 518 | DBG("*irq %u*\n", irq); |
518 | do_IRQ(irq, regs); | 519 | do_IRQ(irq, regs); |
519 | } | 520 | } |