Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f8782c4 authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Ralf Baechle
Browse files

[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: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent bc818247

arch/mips/sgi-ip32/ip32-irq.c

+4 −3
Original line number Diff line number Diff line
@@ -507,13 +507,14 @@ static void ip32_irq0(struct pt_regs *regs) 
	int irq = 0;



	crime_int = crime->istat & crime_mask;

	irq = ffs(crime_int);

	crime_int = 1 << (irq - 1);

	irq = __ffs(crime_int);

	crime_int = 1 << irq;



	if (crime_int & CRIME_MACEISA_INT_MASK) {

		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);

	do_IRQ(irq, regs);

}