From 57e11b570d8bf9f6e88db79380cf75be3e9bc3c2 Mon Sep 17 00:00:00 2001
From: Glauber Costa <gcosta@redhat.com>
Date: Tue, 8 Apr 2008 13:20:43 -0300
Subject: [PATCH] --- yaml --- r: 91015 b: refs/heads/master c:
 459121c9ec1e6c5d701f6520f4170719ac008951 h: refs/heads/master i:   91013:
 810eefb4016d66ccc6b2089db7b1ddf7182ebb90   91011:
 9b1cc60b6bc5eb6a4ef13cdd3ca6ca7fcce611a6   91007:
 dbd86edd0a38e8c91c664459f1d3e8ad062bb7c2 v: v3

---
 [refs]                             |  2 +-
 trunk/arch/x86/kernel/Makefile     |  2 +-
 trunk/arch/x86/kernel/pci-dma.c    | 14 ++++++++++++++
 trunk/arch/x86/kernel/pci-dma_32.c | 12 ------------
 trunk/arch/x86/kernel/pci-dma_64.c |  9 ---------
 5 files changed, 16 insertions(+), 23 deletions(-)
 create mode 100644 trunk/arch/x86/kernel/pci-dma.c

diff --git a/[refs] b/[refs]
index eb257d40d9bc..94939be78b04 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19e395afb44746ce7422a9eabcf883d5eec2bb80
+refs/heads/master: 459121c9ec1e6c5d701f6520f4170719ac008951
diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/arch/x86/kernel/Makefile
index edd5c54ffde9..1799f76a6a95 100644
--- a/trunk/arch/x86/kernel/Makefile
+++ b/trunk/arch/x86/kernel/Makefile
@@ -23,7 +23,7 @@ obj-$(CONFIG_X86_32)	+= sys_i386_32.o i386_ksyms_32.o
 obj-$(CONFIG_X86_64)	+= sys_x86_64.o x8664_ksyms_64.o
 obj-$(CONFIG_X86_64)	+= syscall_64.o vsyscall_64.o setup64.o
 obj-y			+= pci-dma_$(BITS).o  bootflag.o e820_$(BITS).o
-obj-y			+= quirks.o i8237.o topology.o kdebugfs.o
+obj-y			+= pci-dma.o quirks.o i8237.o topology.o kdebugfs.o
 obj-y			+= alternative.o i8253.o
 obj-$(CONFIG_X86_64)	+= pci-nommu_64.o bugs_64.o
 obj-$(CONFIG_X86_32)	+= pci-base_32.o
diff --git a/trunk/arch/x86/kernel/pci-dma.c b/trunk/arch/x86/kernel/pci-dma.c
new file mode 100644
index 000000000000..f1c24d8e7942
--- /dev/null
+++ b/trunk/arch/x86/kernel/pci-dma.c
@@ -0,0 +1,14 @@
+#include <linux/dma-mapping.h>
+
+int dma_set_mask(struct device *dev, u64 mask)
+{
+	if (!dev->dma_mask || !dma_supported(dev, mask))
+		return -EIO;
+
+	*dev->dma_mask = mask;
+
+	return 0;
+}
+EXPORT_SYMBOL(dma_set_mask);
+
+
diff --git a/trunk/arch/x86/kernel/pci-dma_32.c b/trunk/arch/x86/kernel/pci-dma_32.c
index be6b1f6aa1a7..9e8297657c32 100644
--- a/trunk/arch/x86/kernel/pci-dma_32.c
+++ b/trunk/arch/x86/kernel/pci-dma_32.c
@@ -182,18 +182,6 @@ dma_supported(struct device *dev, u64 mask)
 }
 EXPORT_SYMBOL(dma_supported);
 
-int
-dma_set_mask(struct device *dev, u64 mask)
-{
-	if (!dev->dma_mask || !dma_supported(dev, mask))
-		return -EIO;
-
-	*dev->dma_mask = mask;
-
-	return 0;
-}
-EXPORT_SYMBOL(dma_set_mask);
-
 
 static __devinit void via_no_dac(struct pci_dev *dev)
 {
diff --git a/trunk/arch/x86/kernel/pci-dma_64.c b/trunk/arch/x86/kernel/pci-dma_64.c
index f97a08d0a8f9..e697b865c1a3 100644
--- a/trunk/arch/x86/kernel/pci-dma_64.c
+++ b/trunk/arch/x86/kernel/pci-dma_64.c
@@ -213,15 +213,6 @@ int dma_supported(struct device *dev, u64 mask)
 }
 EXPORT_SYMBOL(dma_supported);
 
-int dma_set_mask(struct device *dev, u64 mask)
-{
-	if (!dev->dma_mask || !dma_supported(dev, mask))
-		return -EIO;
-	*dev->dma_mask = mask;
-	return 0;
-}
-EXPORT_SYMBOL(dma_set_mask);
-
 /*
  * See <Documentation/x86_64/boot-options.txt> for the iommu kernel parameter
  * documentation.