From e4455274756901efde2bfcae7d6a65db179f6945 Mon Sep 17 00:00:00 2001
From: Glauber Costa <gcosta@redhat.com>
Date: Tue, 8 Apr 2008 13:20:50 -0300
Subject: [PATCH] --- yaml --- r: 91022 b: refs/heads/master c:
 85c246ee16fe00bf7bf9e7ff09a5d17d9a83cf71 h: refs/heads/master v: v3

---
 [refs]                              |  2 +-
 trunk/arch/x86/kernel/pci-base_32.c | 11 ++++++++---
 trunk/arch/x86/kernel/pci-dma.c     |  3 +++
 trunk/arch/x86/mm/init_64.c         |  3 ---
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index f565c712c238..ad787db0c4b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d741bde26dc3444eaeb269051d3f0b623b24de13
+refs/heads/master: 85c246ee16fe00bf7bf9e7ff09a5d17d9a83cf71
diff --git a/trunk/arch/x86/kernel/pci-base_32.c b/trunk/arch/x86/kernel/pci-base_32.c
index 837bbe91043e..b44ea517fcf0 100644
--- a/trunk/arch/x86/kernel/pci-base_32.c
+++ b/trunk/arch/x86/kernel/pci-base_32.c
@@ -37,7 +37,7 @@ static int pci32_map_error(dma_addr_t dma_addr)
 	return 0;
 }
 
-static const struct dma_mapping_ops pci32_dma_ops = {
+const struct dma_mapping_ops pci32_dma_ops = {
 	.map_single = pci32_map_single,
 	.unmap_single = NULL,
 	.map_sg = pci32_dma_map_sg,
@@ -51,5 +51,10 @@ static const struct dma_mapping_ops pci32_dma_ops = {
 	.mapping_error = pci32_map_error,
 };
 
-const struct dma_mapping_ops *dma_ops = &pci32_dma_ops;
-EXPORT_SYMBOL(dma_ops);
+/* this is temporary */
+int __init no_iommu_init(void)
+{
+	dma_ops = &pci32_dma_ops;
+	return 0;
+}
+fs_initcall(no_iommu_init);
diff --git a/trunk/arch/x86/kernel/pci-dma.c b/trunk/arch/x86/kernel/pci-dma.c
index f1c24d8e7942..1323cd80387b 100644
--- a/trunk/arch/x86/kernel/pci-dma.c
+++ b/trunk/arch/x86/kernel/pci-dma.c
@@ -1,5 +1,8 @@
 #include <linux/dma-mapping.h>
 
+const struct dma_mapping_ops *dma_ops;
+EXPORT_SYMBOL(dma_ops);
+
 int dma_set_mask(struct device *dev, u64 mask)
 {
 	if (!dev->dma_mask || !dma_supported(dev, mask))
diff --git a/trunk/arch/x86/mm/init_64.c b/trunk/arch/x86/mm/init_64.c
index 1076097dcab2..1ff7906a9a4d 100644
--- a/trunk/arch/x86/mm/init_64.c
+++ b/trunk/arch/x86/mm/init_64.c
@@ -47,9 +47,6 @@
 #include <asm/numa.h>
 #include <asm/cacheflush.h>
 
-const struct dma_mapping_ops *dma_ops;
-EXPORT_SYMBOL(dma_ops);
-
 static unsigned long dma_reserve __initdata;
 
 DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);