summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorGlauber Costa2008-03-25 22:36:37 +0100
committerIngo Molnar2008-04-19 19:19:57 +0200
commitc786df08f6df2833e34e78cee5ef62558e3b5346 (patch)
treea699d91f610f9e33092c59589afc7c1bc6e65ee8 /arch/x86/kernel
parentx86: provide a bad_dma_address symbol for i386 (diff)
downloadkernel-qcow2-linux-c786df08f6df2833e34e78cee5ef62558e3b5346.tar.gz
kernel-qcow2-linux-c786df08f6df2833e34e78cee5ef62558e3b5346.tar.xz
kernel-qcow2-linux-c786df08f6df2833e34e78cee5ef62558e3b5346.zip
x86: unify dma_mapping_error
We provide a map_error function in pci-base_32.c to make sure i386 keeps with the same behaviour it used to. Signed-off-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/pci-base_32.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/kernel/pci-base_32.c b/arch/x86/kernel/pci-base_32.c
index cf4bb28dfc6a..7caf5c211f23 100644
--- a/arch/x86/kernel/pci-base_32.c
+++ b/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;