3 files changed, 7 insertions, 8 deletions

diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S
index 9d09f0ad6efe..ae48a002f81a 100644
--- a/arch/powerpc/kernel/misc_64.S
+++ b/arch/powerpc/kernel/misc_64.S
@@ -89,12 +89,12 @@ _GLOBAL(call_do_softirq)
         mtlr    r0
         blr
 
-_GLOBAL(call_ppc_irq_dispatch_handler)
+_GLOBAL(call___do_IRQ)
         mflr    r0
         std     r0,16(r1)
         stdu    r1,THREAD_SIZE-112(r5)
         mr      r1,r5
-        bl      .ppc_irq_dispatch_handler
+        bl      .__do_IRQ
         ld      r1,0(r1)
         ld      r0,16(r1)
         mtlr    r0
diff --git a/arch/powerpc/platforms/iseries/irq.c b/arch/powerpc/platforms/iseries/irq.c
index a0ff7d95fdf3..01090e9ce0cf 100644
--- a/arch/powerpc/platforms/iseries/irq.c
+++ b/arch/powerpc/platforms/iseries/irq.c
@@ -120,13 +120,13 @@ static void intReceived(struct XmPciLpEvent *eventParm,
                 if (curtp != irqtp) {
                         irqtp->task = curtp->task;
                         irqtp->flags = 0;
-                        call_ppc_irq_dispatch_handler(regsParm, irq, irqtp);
+                        call___do_IRQ(irq, regsParm, irqtp);
                         irqtp->task = NULL;
                         if (irqtp->flags)
                                 set_bits(irqtp->flags, &curtp->flags);
                 } else
 #endif
-                        ppc_irq_dispatch_handler(regsParm, irq);
+                        __do_IRQ(irq, regsParm);
                 HvCallPci_eoi(eventParm->eventData.slotInterrupt.busNumber,
                         eventParm->eventData.slotInterrupt.subBusNumber,
                         eventParm->eventData.slotInterrupt.deviceId);
@@ -326,10 +326,8 @@ static void iSeries_disable_IRQ(unsigned int irq)
 }
 
 /*
- * Need to define this so ppc_irq_dispatch_handler will NOT call
- * enable_IRQ at the end of interrupt handling.  However, this does
- * nothing because there is not enough information provided to do
- * the EOI HvCall.  This is done by XmPciLpEvent.c
+ * This does nothing because there is not enough information
+ * provided to do the EOI HvCall.  This is done by XmPciLpEvent.c
  */
 static void iSeries_end_IRQ(unsigned int irq)
 {
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
index c72c86f05cb6..405c4f3229b3 100644
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
@@ -567,6 +567,7 @@ nextnode:
 
         xics_8259_pic.enable = i8259_pic.enable;
         xics_8259_pic.disable = i8259_pic.disable;
+        xics_8259_pic.end = i8259_pic.end;
         for (i = 0; i < 16; ++i)
                 get_irq_desc(i)->handler = &xics_8259_pic;
         for (; i < NR_IRQS; ++i)