Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Oprofile: Fix computation of number of counters.
  [MIPS] Alchemy: fix IRQ bases
  [MIPS] Alchemy: replace ffs() with __ffs()
  [MIPS] BCM1480: Fix interrupt routing, take 2.

1 files changed, 8 insertions, 8 deletions

diff --git a/arch/mips/au1000/common/irq.c b/arch/mips/au1000/common/irq.c
index ddfb7f0a17a6..3c7714f057ac 100644
--- a/arch/mips/au1000/common/irq.c
+++ b/arch/mips/au1000/common/irq.c
@@ -462,9 +462,9 @@ static void intc0_req0_irqdispatch(void)
                 return;
         }
 #endif
-        bit = ffs(intc0_req0);
+        bit = __ffs(intc0_req0);
         intc0_req0 &= ~(1 << bit);
-        do_IRQ(MIPS_CPU_IRQ_BASE + bit);
+        do_IRQ(AU1000_INTC0_INT_BASE + bit);
 }
 
 
@@ -478,9 +478,9 @@ static void intc0_req1_irqdispatch(void)
         if (!intc0_req1)
                 return;
 
-        bit = ffs(intc0_req1);
+        bit = __ffs(intc0_req1);
         intc0_req1 &= ~(1 << bit);
-        do_IRQ(bit);
+        do_IRQ(AU1000_INTC0_INT_BASE + bit);
 }
 
 
@@ -498,9 +498,9 @@ static void intc1_req0_irqdispatch(void)
         if (!intc1_req0)
                 return;
 
-        bit = ffs(intc1_req0);
+        bit = __ffs(intc1_req0);
         intc1_req0 &= ~(1 << bit);
-        do_IRQ(MIPS_CPU_IRQ_BASE + 32 + bit);
+        do_IRQ(AU1000_INTC1_INT_BASE + bit);
 }
 
 
@@ -514,9 +514,9 @@ static void intc1_req1_irqdispatch(void)
         if (!intc1_req1)
                 return;
 
-        bit = ffs(intc1_req1);
+        bit = __ffs(intc1_req1);
         intc1_req1 &= ~(1 << bit);
-        do_IRQ(MIPS_CPU_IRQ_BASE + 32 + bit);
+        do_IRQ(AU1000_INTC1_INT_BASE + bit);
 }
 
 asmlinkage void plat_irq_dispatch(void)