8 files changed, 20 insertions, 11 deletions

diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 7e97d71a5f8f..73d509343d5b 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -70,6 +70,11 @@ int global_phb_number;		/* Global phb counter */
 struct pci_dev *ppc64_isabridge_dev = NULL;
 EXPORT_SYMBOL_GPL(ppc64_isabridge_dev);
 
+void set_pci_dma_ops(struct dma_mapping_ops *dma_ops)
+{
+        pci_dma_ops = dma_ops;
+}
+
 static void fixup_broken_pcnet32(struct pci_dev* dev)
 {
         if ((dev->class>>8 == PCI_CLASS_NETWORK_ETHERNET)) {
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index 67d617b60a23..d0e02ea1d538 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -646,7 +646,7 @@ static int __init cell_iommu_init_disabled(void)
         unsigned long base = 0, size;
 
         /* When no iommu is present, we use direct DMA ops */
-        pci_dma_ops = &dma_direct_ops;
+        set_pci_dma_ops(&dma_direct_ops);
 
         /* First make sure all IOC translation is turned off */
         cell_disable_iommus();
@@ -734,7 +734,7 @@ static int __init cell_iommu_init(void)
         }
 
         /* Setup default PCI iommu ops */
-        pci_dma_ops = &dma_iommu_ops;
+        set_pci_dma_ops(&dma_iommu_ops);
 
  bail:
         /* Register callbacks on OF platform device addition/removal
diff --git a/arch/powerpc/platforms/celleb/iommu.c b/arch/powerpc/platforms/celleb/iommu.c
index f63b94c65353..fecc4ffd475e 100644
--- a/arch/powerpc/platforms/celleb/iommu.c
+++ b/arch/powerpc/platforms/celleb/iommu.c
@@ -95,7 +95,7 @@ static int __init celleb_init_iommu(void)
                 return -ENODEV;
 
         celleb_init_direct_mapping();
-        pci_dma_ops = &dma_direct_ops;
+        set_pci_dma_ops(&dma_direct_ops);
         bus_register_notifier(&of_platform_bus_type, &celleb_of_bus_notifier);
 
         return 0;
diff --git a/arch/powerpc/platforms/iseries/iommu.c b/arch/powerpc/platforms/iseries/iommu.c
index d7a756d5135c..7df2902271d0 100644
--- a/arch/powerpc/platforms/iseries/iommu.c
+++ b/arch/powerpc/platforms/iseries/iommu.c
@@ -194,5 +194,5 @@ void iommu_init_early_iSeries(void)
         ppc_md.tce_build = tce_build_iSeries;
         ppc_md.tce_free  = tce_free_iSeries;
 
-        pci_dma_ops = &dma_iommu_ops;
+        set_pci_dma_ops(&dma_iommu_ops);
 }
diff --git a/arch/powerpc/platforms/pasemi/iommu.c b/arch/powerpc/platforms/pasemi/iommu.c
index 459a53b7d24d..4587c1dfeda5 100644
--- a/arch/powerpc/platforms/pasemi/iommu.c
+++ b/arch/powerpc/platforms/pasemi/iommu.c
@@ -255,7 +255,7 @@ void iommu_init_early_pasemi(void)
                 /* Direct I/O, IOMMU off */
                 ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_null;
                 ppc_md.pci_dma_bus_setup = pci_dma_bus_setup_null;
-                pci_dma_ops = &dma_direct_ops;
+                set_pci_dma_ops(&dma_direct_ops);
 
                 return;
         }
@@ -266,7 +266,7 @@ void iommu_init_early_pasemi(void)
         ppc_md.pci_dma_bus_setup = pci_dma_bus_setup_pasemi;
         ppc_md.tce_build = iobmap_build;
         ppc_md.tce_free  = iobmap_free;
-        pci_dma_ops = &dma_iommu_ops;
+        set_pci_dma_ops(&dma_iommu_ops);
 }
 
 void __init alloc_iobmap_l2(void)
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index e6653a868b91..9322f74e1d8b 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -562,7 +562,7 @@ void iommu_init_early_pSeries(void)
                 /* Direct I/O, IOMMU off */
                 ppc_md.pci_dma_dev_setup = NULL;
                 ppc_md.pci_dma_bus_setup = NULL;
-                pci_dma_ops = &dma_direct_ops;
+                set_pci_dma_ops(&dma_direct_ops);
                 return;
         }
 
@@ -588,6 +588,6 @@ void iommu_init_early_pSeries(void)
 
         pSeries_reconfig_notifier_register(&iommu_reconfig_nb);
 
-        pci_dma_ops = &dma_iommu_ops;
+        set_pci_dma_ops(&dma_iommu_ops);
 }
 
diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c
index 1488535b0e13..336186dd7f10 100644
--- a/arch/powerpc/sysdev/dart_iommu.c
+++ b/arch/powerpc/sysdev/dart_iommu.c
@@ -333,7 +333,7 @@ void iommu_init_early_dart(void)
                 ppc_md.pci_dma_bus_setup = pci_dma_bus_setup_dart;
 
                 /* Setup pci_dma ops */
-                pci_dma_ops = &dma_iommu_ops;
+                set_pci_dma_ops(&dma_iommu_ops);
                 return;
         }
 
@@ -343,7 +343,7 @@ void iommu_init_early_dart(void)
         ppc_md.pci_dma_bus_setup = NULL;
 
         /* Setup pci_dma ops */
-        pci_dma_ops = &dma_direct_ops;
+        set_pci_dma_ops(&dma_direct_ops);
 }
 
 
diff --git a/include/asm-powerpc/pci.h b/include/asm-powerpc/pci.h
index ac656ee6bb19..ebf31f1c5915 100644
--- a/include/asm-powerpc/pci.h
+++ b/include/asm-powerpc/pci.h
@@ -70,8 +70,11 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
  */
 #define PCI_DISABLE_MWI
 
+#ifdef CONFIG_PCI
 extern struct dma_mapping_ops *pci_dma_ops;
 
+extern void set_pci_dma_ops(struct dma_mapping_ops *dma_ops);
+
 /* For DAC DMA, we currently don't support it by default, but
  * we let 64-bit platforms override this.
  */
@@ -82,7 +85,6 @@ static inline int pci_dac_dma_supported(struct pci_dev *hwdev,u64 mask)
         return 0;
 }
 
-#ifdef CONFIG_PCI
 static inline void pci_dma_burst_advice(struct pci_dev *pdev,
                                         enum pci_dma_burst_strategy *strat,
                                         unsigned long *strategy_parameter)
@@ -99,6 +101,8 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev,
         *strat = PCI_DMA_BURST_MULTIPLE;
         *strategy_parameter = cacheline_size;
 }
+#else   /* CONFIG_PCI */
+#define set_pci_dma_ops(d)
 #endif
 
 extern int pci_domain_nr(struct pci_bus *bus);