lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[MIPS] Use __ffs() instead of ffs() in ip32_irq0().

Browse Source 
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>
This commit is contained in:
Atsushi Nemoto
2006-04-17 21:24:49 +09:00
committed by Ralf Baechle
parent bc81824720
commit 6f8782c4b2
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/mips/sgi-ip32/ip32-irq.c
View File

@@ -507,13 +507,14 @@ static void ip32_irq0(struct pt_regs *regs)
int irq = 0; int irq = 0;
crime_int = crime->istat & crime_mask; crime_int = crime->istat & crime_mask;
irq = ffs(crime_int); irq = __ffs(crime_int);
crime_int = 1 << (irq - 1); crime_int = 1 << irq;
if (crime_int & CRIME_MACEISA_INT_MASK) { if (crime_int & CRIME_MACEISA_INT_MASK) {
unsigned long mace_int = mace->perif.ctrl.istat; unsigned long mace_int = mace->perif.ctrl.istat;
irq = ffs(mace_int & maceisa_mask) + 32; irq = __ffs(mace_int & maceisa_mask) + 32;
} }
irq++;
DBG("*irq %u*\n", irq); DBG("*irq %u*\n", irq);
do_IRQ(irq, regs); do_IRQ(irq, regs);
} }