aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/pci-gart_64.c
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2008-08-19 10:32:45 -0400
committerIngo Molnar <mingo@elte.hu>2008-08-22 02:34:51 -0400
commit6c505ce3930c6a6b455cda53fab3e88ae44f8221 (patch)
tree5b6254c6589f458ad0af21d7f6fbc998ebfd3714 /arch/x86/kernel/pci-gart_64.c
parentc647c3bb2d16246a87f49035985ddb7c1eb030df (diff)
x86: move dma_*_coherent functions to include file
All the x86 DMA-API functions are defined in asm/dma-mapping.h. This patch moves the dma_*_coherent functions also to this header file because they are now small enough to do so. This is done as a separate patch because it also includes some renaming and restructuring of the dma-mapping.h file. Signed-off-by: Joerg Roedel <joerg.roede@amd.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/pci-gart_64.c')
-rw-r--r--arch/x86/kernel/pci-gart_64.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c
index ef753e233580..e81df25dc067 100644
--- a/arch/x86/kernel/pci-gart_64.c
+++ b/arch/x86/kernel/pci-gart_64.c
@@ -276,7 +276,7 @@ gart_map_single(struct device *dev, phys_addr_t paddr, size_t size, int dir)
276 unsigned long bus; 276 unsigned long bus;
277 277
278 if (!dev) 278 if (!dev)
279 dev = &fallback_dev; 279 dev = &x86_dma_fallback_dev;
280 280
281 if (!need_iommu(dev, paddr, size)) 281 if (!need_iommu(dev, paddr, size))
282 return paddr; 282 return paddr;
@@ -427,7 +427,7 @@ gart_map_sg(struct device *dev, struct scatterlist *sg, int nents, int dir)
427 return 0; 427 return 0;
428 428
429 if (!dev) 429 if (!dev)
430 dev = &fallback_dev; 430 dev = &x86_dma_fallback_dev;
431 431
432 out = 0; 432 out = 0;
433 start = 0; 433 start = 0;