Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Fix G5 DART (IOMMU) race causing occasional data corruption
  [POWERPC] Fix MMIO ops to provide expected barrier behaviour
  [POWERPC] Fix interrupt clearing in kdump shutdown sequence
  [POWERPC] update prep_defconfig
  [POWERPC] kdump: Support kernels having 64k page size.
  [POWERPC] Implement PowerPC futex_atomic_cmpxchg_inatomic().
  [POWERPC] Add new, missing argument to of_irq_map_raw() for 86xx.
  [POWERPC] Update defconfigs

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index 0b1b52168bb7..5e583cf38786 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -158,7 +158,7 @@ get_pci_irq_from_of(struct pci_controller *hose, int slot, int pin)
 
         laddr[0] = (hose->first_busno << 16) | (PCI_DEVFN(slot, 0) << 8);
         laddr[1] = laddr[2] = 0;
-        of_irq_map_raw(hosenode, &pin, laddr, &oirq);
+        of_irq_map_raw(hosenode, &pin, 1, laddr, &oirq);
         DBG("mpc86xx_hpcn: pci irq addr %x, slot %d, pin %d, irq %d\n",
                         laddr[0], slot, pin, oirq.specifier[0]);
         return oirq.specifier[0];