2 files changed, 10 insertions, 6 deletions

diff --git a/arch/ia64/sn/pci/pcibr/pcibr_provider.c b/arch/ia64/sn/pci/pcibr/pcibr_provider.c
index b95e928636a1..dfaf01e5be80 100644
--- a/arch/ia64/sn/pci/pcibr/pcibr_provider.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_provider.c
@@ -60,7 +60,7 @@ static int sal_pcibr_error_interrupt(struct pcibus_info *soft)
         ret_stuff.status = 0;
         ret_stuff.v0 = 0;
 
-        segment = 0;
+        segment = soft->pbi_buscommon.bs_persist_segment;
         busnum = soft->pbi_buscommon.bs_persist_busnum;
         SAL_CALL_NOLOCK(ret_stuff,
                         (u64) SN_SAL_IOIF_ERROR_INTERRUPT,
@@ -142,9 +142,12 @@ pcibr_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
                              j++, sn_flush_device_list++) {
                                 if (sn_flush_device_list->sfdl_slot == -1)
                                         continue;
-                                if (sn_flush_device_list->
-                                    sfdl_persistent_busnum ==
-                                    soft->pbi_buscommon.bs_persist_busnum)
+                                if ((sn_flush_device_list->
+                                     sfdl_persistent_segment ==
+                                     soft->pbi_buscommon.bs_persist_segment) &&
+                                     (sn_flush_device_list->
+                                     sfdl_persistent_busnum ==
+                                     soft->pbi_buscommon.bs_persist_busnum))
                                         sn_flush_device_list->sfdl_pcibus_info =
                                             soft;
                         }
diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c
index 5d76a7581465..2fef7c10d6e5 100644
--- a/arch/ia64/sn/pci/tioca_provider.c
+++ b/arch/ia64/sn/pci/tioca_provider.c
@@ -559,7 +559,7 @@ tioca_error_intr_handler(int irq, void *arg, struct pt_regs *pt)
         ret_stuff.status = 0;
         ret_stuff.v0 = 0;
 
-        segment = 0;
+        segment = soft->ca_common.bs_persist_segment;
         busnum = soft->ca_common.bs_persist_busnum;
 
         SAL_CALL_NOLOCK(ret_stuff,
@@ -622,7 +622,8 @@ tioca_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
             nasid_to_cnodeid(tioca_common->ca_closest_nasid);
         tioca_common->ca_kernel_private = (uint64_t) tioca_kern;
 
-        bus = pci_find_bus(0, tioca_common->ca_common.bs_persist_busnum);
+        bus = pci_find_bus(tioca_common->ca_common.bs_persist_segment,
+                tioca_common->ca_common.bs_persist_busnum);
         BUG_ON(!bus);
         tioca_kern->ca_devices = &bus->devices;