From 6e3184f6422761831ae68223031b1e3702903650 Mon Sep 17 00:00:00 2001 From: Atsushi Nemoto Date: Mon, 17 Apr 2006 21:24:49 +0900 Subject: [PATCH] --- yaml --- r: 26229 b: refs/heads/master c: 6f8782c4b2ed3cb652f1ad6b6d91890c7f2423ab h: refs/heads/master i: 26227: cef9c3bc3a770e7f0b544f83b51d1f0b4009cd6d v: v3 --- [refs] | 2 +- trunk/arch/mips/sgi-ip32/ip32-irq.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 34331c00a0dc..bbdecc7ffb7b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc818247203a7bfc40296a3f5b760de84fb8e0d1 +refs/heads/master: 6f8782c4b2ed3cb652f1ad6b6d91890c7f2423ab diff --git a/trunk/arch/mips/sgi-ip32/ip32-irq.c b/trunk/arch/mips/sgi-ip32/ip32-irq.c index 22a6df94b4a1..de01c9815bdd 100644 --- a/trunk/arch/mips/sgi-ip32/ip32-irq.c +++ b/trunk/arch/mips/sgi-ip32/ip32-irq.c @@ -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); }