diff options
-rw-r--r-- | include/asm-x86/dma-mapping.h | 10 | ||||
-rw-r--r-- | include/asm-x86/dma-mapping_32.h | 9 | ||||
-rw-r--r-- | include/asm-x86/dma-mapping_64.h | 11 |
3 files changed, 10 insertions, 20 deletions
diff --git a/include/asm-x86/dma-mapping.h b/include/asm-x86/dma-mapping.h index 53a404b0f9ee..3ea3802ff1aa 100644 --- a/include/asm-x86/dma-mapping.h +++ b/include/asm-x86/dma-mapping.h | |||
@@ -52,6 +52,16 @@ struct dma_mapping_ops { | |||
52 | 52 | ||
53 | extern const struct dma_mapping_ops *dma_ops; | 53 | extern const struct dma_mapping_ops *dma_ops; |
54 | 54 | ||
55 | #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) | ||
56 | #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) | ||
57 | |||
58 | void *dma_alloc_coherent(struct device *dev, size_t size, | ||
59 | dma_addr_t *dma_handle, gfp_t flag); | ||
60 | |||
61 | void dma_free_coherent(struct device *dev, size_t size, | ||
62 | void *vaddr, dma_addr_t dma_handle); | ||
63 | |||
64 | |||
55 | #ifdef CONFIG_X86_32 | 65 | #ifdef CONFIG_X86_32 |
56 | # include "dma-mapping_32.h" | 66 | # include "dma-mapping_32.h" |
57 | #else | 67 | #else |
diff --git a/include/asm-x86/dma-mapping_32.h b/include/asm-x86/dma-mapping_32.h index eff42f495107..d8f6420d3ef1 100644 --- a/include/asm-x86/dma-mapping_32.h +++ b/include/asm-x86/dma-mapping_32.h | |||
@@ -8,15 +8,6 @@ | |||
8 | #include <asm/io.h> | 8 | #include <asm/io.h> |
9 | #include <asm/bug.h> | 9 | #include <asm/bug.h> |
10 | 10 | ||
11 | #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) | ||
12 | #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) | ||
13 | |||
14 | void *dma_alloc_coherent(struct device *dev, size_t size, | ||
15 | dma_addr_t *dma_handle, gfp_t flag); | ||
16 | |||
17 | void dma_free_coherent(struct device *dev, size_t size, | ||
18 | void *vaddr, dma_addr_t dma_handle); | ||
19 | |||
20 | static inline dma_addr_t | 11 | static inline dma_addr_t |
21 | dma_map_page(struct device *dev, struct page *page, unsigned long offset, | 12 | dma_map_page(struct device *dev, struct page *page, unsigned long offset, |
22 | size_t size, enum dma_data_direction direction) | 13 | size_t size, enum dma_data_direction direction) |
diff --git a/include/asm-x86/dma-mapping_64.h b/include/asm-x86/dma-mapping_64.h index 707dbbe86a26..ce881d992228 100644 --- a/include/asm-x86/dma-mapping_64.h +++ b/include/asm-x86/dma-mapping_64.h | |||
@@ -12,17 +12,6 @@ static inline int dma_mapping_error(dma_addr_t dma_addr) | |||
12 | return (dma_addr == bad_dma_address); | 12 | return (dma_addr == bad_dma_address); |
13 | } | 13 | } |
14 | 14 | ||
15 | #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) | ||
16 | #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) | ||
17 | |||
18 | #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) | ||
19 | #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) | ||
20 | |||
21 | extern void *dma_alloc_coherent(struct device *dev, size_t size, | ||
22 | dma_addr_t *dma_handle, gfp_t gfp); | ||
23 | extern void dma_free_coherent(struct device *dev, size_t size, void *vaddr, | ||
24 | dma_addr_t dma_handle); | ||
25 | |||
26 | #define dma_map_page(dev,page,offset,size,dir) \ | 15 | #define dma_map_page(dev,page,offset,size,dir) \ |
27 | dma_map_single((dev), page_address(page)+(offset), (size), (dir)) | 16 | dma_map_single((dev), page_address(page)+(offset), (size), (dir)) |
28 | 17 | ||