3 files changed, 10 insertions, 5 deletions

diff --git a/arch/ia64/sn/pci/pcibr/pcibr_provider.c b/arch/ia64/sn/pci/pcibr/pcibr_provider.c
index 04a8256017eb..b42bfcae6f91 100644
--- a/arch/ia64/sn/pci/pcibr/pcibr_provider.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_provider.c
@@ -15,6 +15,7 @@
 #include <asm/sn/pcibus_provider_defs.h>
 #include <asm/sn/pcidev.h>
 #include <asm/sn/sn_sal.h>
+#include <asm/sn/pic.h>
 #include <asm/sn/sn2/sn_hwperf.h>
 #include "xtalk/xwidgetdev.h"
 #include "xtalk/hubdev.h"
@@ -130,9 +131,9 @@ pcibr_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
         }
 
         memcpy(soft, prom_bussoft, sizeof(struct pcibus_info));
-        soft->pbi_buscommon.bs_base =
-            (((u64) soft->pbi_buscommon.
-              bs_base << 4) >> 4) | __IA64_UNCACHED_OFFSET;
+        soft->pbi_buscommon.bs_base = (unsigned long)
+                ioremap(REGION_OFFSET(soft->pbi_buscommon.bs_base),
+                        sizeof(struct pic));
 
         spin_lock_init(&soft->pbi_lock);
 
diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c
index b9bedbd6e1d6..d798dd4d0dc4 100644
--- a/arch/ia64/sn/pci/tioca_provider.c
+++ b/arch/ia64/sn/pci/tioca_provider.c
@@ -610,7 +610,9 @@ tioca_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
                 return NULL;
 
         memcpy(tioca_common, prom_bussoft, sizeof(struct tioca_common));
-        tioca_common->ca_common.bs_base |= __IA64_UNCACHED_OFFSET;
+        tioca_common->ca_common.bs_base = (unsigned long)
+                ioremap(REGION_OFFSET(tioca_common->ca_common.bs_base),
+                        sizeof(struct tioca_common));
 
         /* init kernel-private area */
 
diff --git a/arch/ia64/sn/pci/tioce_provider.c b/arch/ia64/sn/pci/tioce_provider.c
index f4c0b961a939..84b72b27e27f 100644
--- a/arch/ia64/sn/pci/tioce_provider.c
+++ b/arch/ia64/sn/pci/tioce_provider.c
@@ -1002,7 +1002,9 @@ tioce_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
                 return NULL;
 
         memcpy(tioce_common, prom_bussoft, sizeof(struct tioce_common));
-        tioce_common->ce_pcibus.bs_base |= __IA64_UNCACHED_OFFSET;
+        tioce_common->ce_pcibus.bs_base = (unsigned long)
+                ioremap(REGION_OFFSET(tioce_common->ce_pcibus.bs_base),
+                        sizeof(struct tioce_common));
 
         tioce_kern = tioce_kern_init(tioce_common);
         if (tioce_kern == NULL) {