aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorGlauber Costa <gcosta@redhat.com>2008-03-25 17:36:37 -0400
committerIngo Molnar <mingo@elte.hu>2008-04-19 13:19:57 -0400
commitc786df08f6df2833e34e78cee5ef62558e3b5346 (patch)
treea699d91f610f9e33092c59589afc7c1bc6e65ee8 /arch/x86
parent7c18341665917b493fa40eeb3c7ff6c1a5ac47db (diff)
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')
-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,
30 return nents; 30 return nents;
31} 31}
32 32
33/* Make sure we keep the same behaviour */
34static int pci32_map_error(dma_addr_t dma_addr)
35{
36 return 0;
37}
38
33static const struct dma_mapping_ops pci32_dma_ops = { 39static const struct dma_mapping_ops pci32_dma_ops = {
34 .map_single = pci32_map_single, 40 .map_single = pci32_map_single,
35 .unmap_single = NULL, 41 .unmap_single = NULL,
@@ -41,6 +47,7 @@ static const struct dma_mapping_ops pci32_dma_ops = {
41 .sync_single_range_for_device = NULL, 47 .sync_single_range_for_device = NULL,
42 .sync_sg_for_cpu = NULL, 48 .sync_sg_for_cpu = NULL,
43 .sync_sg_for_device = NULL, 49 .sync_sg_for_device = NULL,
50 .mapping_error = pci32_map_error,
44}; 51};
45 52
46const struct dma_mapping_ops *dma_ops = &pci32_dma_ops; 53const struct dma_mapping_ops *dma_ops = &pci32_dma_ops;