diff options
Diffstat (limited to 'include/linux/dma-mapping.h')
| -rw-r--r-- | include/linux/dma-mapping.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index 4210c5c1dd21..e29441b8b3b7 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h | |||
| @@ -153,7 +153,7 @@ static inline int is_device_dma_capable(struct device *dev) | |||
| 153 | return dev->dma_mask != NULL && *dev->dma_mask != DMA_MASK_NONE; | 153 | return dev->dma_mask != NULL && *dev->dma_mask != DMA_MASK_NONE; |
| 154 | } | 154 | } |
| 155 | 155 | ||
| 156 | #ifdef CONFIG_HAVE_GENERIC_DMA_COHERENT | 156 | #ifdef CONFIG_DMA_DECLARE_COHERENT |
| 157 | /* | 157 | /* |
| 158 | * These three functions are only for dma allocator. | 158 | * These three functions are only for dma allocator. |
| 159 | * Don't use them in device drivers. | 159 | * Don't use them in device drivers. |
| @@ -192,7 +192,7 @@ static inline int dma_mmap_from_global_coherent(struct vm_area_struct *vma, | |||
| 192 | { | 192 | { |
| 193 | return 0; | 193 | return 0; |
| 194 | } | 194 | } |
| 195 | #endif /* CONFIG_HAVE_GENERIC_DMA_COHERENT */ | 195 | #endif /* CONFIG_DMA_DECLARE_COHERENT */ |
| 196 | 196 | ||
| 197 | static inline bool dma_is_direct(const struct dma_map_ops *ops) | 197 | static inline bool dma_is_direct(const struct dma_map_ops *ops) |
| 198 | { | 198 | { |
| @@ -739,7 +739,7 @@ static inline int dma_get_cache_alignment(void) | |||
| 739 | /* flags for the coherent memory api */ | 739 | /* flags for the coherent memory api */ |
| 740 | #define DMA_MEMORY_EXCLUSIVE 0x01 | 740 | #define DMA_MEMORY_EXCLUSIVE 0x01 |
| 741 | 741 | ||
| 742 | #ifdef CONFIG_HAVE_GENERIC_DMA_COHERENT | 742 | #ifdef CONFIG_DMA_DECLARE_COHERENT |
| 743 | int dma_declare_coherent_memory(struct device *dev, phys_addr_t phys_addr, | 743 | int dma_declare_coherent_memory(struct device *dev, phys_addr_t phys_addr, |
| 744 | dma_addr_t device_addr, size_t size, int flags); | 744 | dma_addr_t device_addr, size_t size, int flags); |
| 745 | void dma_release_declared_memory(struct device *dev); | 745 | void dma_release_declared_memory(struct device *dev); |
| @@ -764,7 +764,7 @@ dma_mark_declared_memory_occupied(struct device *dev, | |||
| 764 | { | 764 | { |
| 765 | return ERR_PTR(-EBUSY); | 765 | return ERR_PTR(-EBUSY); |
| 766 | } | 766 | } |
| 767 | #endif /* CONFIG_HAVE_GENERIC_DMA_COHERENT */ | 767 | #endif /* CONFIG_DMA_DECLARE_COHERENT */ |
| 768 | 768 | ||
| 769 | static inline void *dmam_alloc_coherent(struct device *dev, size_t size, | 769 | static inline void *dmam_alloc_coherent(struct device *dev, size_t size, |
| 770 | dma_addr_t *dma_handle, gfp_t gfp) | 770 | dma_addr_t *dma_handle, gfp_t gfp) |
