From 9b1cc60b6bc5eb6a4ef13cdd3ca6ca7fcce611a6 Mon Sep 17 00:00:00 2001
From: Glauber Costa <gcosta@redhat.com>
Date: Tue, 25 Mar 2008 18:36:37 -0300
Subject: [PATCH] --- yaml --- r: 91011 b: refs/heads/master c:
 c786df08f6df2833e34e78cee5ef62558e3b5346 h: refs/heads/master i:   91009:
 a995f8d8857ad8b7aa7b44d2211447cb7de6c2d8   91007:
 dbd86edd0a38e8c91c664459f1d3e8ad062bb7c2 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86/kernel/pci-base_32.c    | 7 +++++++
 trunk/include/asm-x86/dma-mapping.h    | 8 ++++++++
 trunk/include/asm-x86/dma-mapping_32.h | 6 ------
 trunk/include/asm-x86/dma-mapping_64.h | 8 --------
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 25d1af8c842f..78b985d04f7b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c18341665917b493fa40eeb3c7ff6c1a5ac47db
+refs/heads/master: c786df08f6df2833e34e78cee5ef62558e3b5346
diff --git a/trunk/arch/x86/kernel/pci-base_32.c b/trunk/arch/x86/kernel/pci-base_32.c
index cf4bb28dfc6a..7caf5c211f23 100644
--- a/trunk/arch/x86/kernel/pci-base_32.c
+++ b/trunk/arch/x86/kernel/pci-base_32.c
@@ -30,6 +30,12 @@ static int pci32_dma_map_sg(struct device *dev, struct scatterlist *sglist,
 	return nents;
 }
 
+/* Make sure we keep the same behaviour */
+static int pci32_map_error(dma_addr_t dma_addr)
+{
+	return 0;
+}
+
 static const struct dma_mapping_ops pci32_dma_ops = {
 	.map_single = pci32_map_single,
 	.unmap_single = NULL,
@@ -41,6 +47,7 @@ static const struct dma_mapping_ops pci32_dma_ops = {
 	.sync_single_range_for_device = NULL,
 	.sync_sg_for_cpu = NULL,
 	.sync_sg_for_device = NULL,
+	.mapping_error = pci32_map_error,
 };
 
 const struct dma_mapping_ops *dma_ops = &pci32_dma_ops;
diff --git a/trunk/include/asm-x86/dma-mapping.h b/trunk/include/asm-x86/dma-mapping.h
index 984935d86bbd..a7090bbb2a2d 100644
--- a/trunk/include/asm-x86/dma-mapping.h
+++ b/trunk/include/asm-x86/dma-mapping.h
@@ -54,6 +54,14 @@ struct dma_mapping_ops {
 
 extern const struct dma_mapping_ops *dma_ops;
 
+static inline int dma_mapping_error(dma_addr_t dma_addr)
+{
+	if (dma_ops->mapping_error)
+		return dma_ops->mapping_error(dma_addr);
+
+	return (dma_addr == bad_dma_address);
+}
+
 #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
 #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
 
diff --git a/trunk/include/asm-x86/dma-mapping_32.h b/trunk/include/asm-x86/dma-mapping_32.h
index d0512c9251b7..03a75f866534 100644
--- a/trunk/include/asm-x86/dma-mapping_32.h
+++ b/trunk/include/asm-x86/dma-mapping_32.h
@@ -8,12 +8,6 @@
 #include <asm/io.h>
 #include <asm/bug.h>
 
-static inline int
-dma_mapping_error(dma_addr_t dma_addr)
-{
-	return 0;
-}
-
 extern int forbid_dac;
 
 static inline int
diff --git a/trunk/include/asm-x86/dma-mapping_64.h b/trunk/include/asm-x86/dma-mapping_64.h
index 352bf4164a5e..8353025f052d 100644
--- a/trunk/include/asm-x86/dma-mapping_64.h
+++ b/trunk/include/asm-x86/dma-mapping_64.h
@@ -3,14 +3,6 @@
 
 extern int iommu_merge;
 
-static inline int dma_mapping_error(dma_addr_t dma_addr)
-{
-	if (dma_ops->mapping_error)
-		return dma_ops->mapping_error(dma_addr);
-
-	return (dma_addr == bad_dma_address);
-}
-
 /* same for gart, swiotlb, and nommu */
 static inline int dma_get_cache_alignment(void)
 {