Merge branch 'next-eeh' into next-sriov

Merge in Gavin EEH fixes

1 files changed, 2 insertions, 1 deletions

diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index b1387ea6d10a..5ac7c60a8801 100644
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -2462,7 +2462,8 @@ static void pnv_ioda_setup_pe_seg(struct pci_controller *hose,
                                 region.start += phb->ioda.io_segsize;
                                 index++;
                         }
-                } else if (res->flags & IORESOURCE_MEM) {
+                } else if ((res->flags & IORESOURCE_MEM) &&
+                           !pnv_pci_is_mem_pref_64(res->flags)) {
                         region.start = res->start -
                                        hose->mem_offset[0] -
                                        phb->ioda.m32_pci_base;