diff options
| author |   Christoph Hellwig <hch@lst.de> | 2018-09-08 11:22:43 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2018-09-20 09:01:15 +0200 |
| commit | bc3ec75de5452db59b683487867ba562b950708a (patch) | |
| tree | ad93be8bbaea3429f83fb0afd6b7597ec90a1e7b /include/linux/dma-noncoherent.h | |
| parent | dma-mapping: move the dma_coherent flag to struct device (diff) | |
| download | wireguard-linux-bc3ec75de5452db59b683487867ba562b950708a.tar.xz wireguard-linux-bc3ec75de5452db59b683487867ba562b950708a.zip | |
dma-mapping: merge direct and noncoherent ops
All the cache maintainance is already stubbed out when not enabled,
but merging the two allows us to nicely handle the case where
cache maintainance is required for some devices, but not others.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Paul Burton <paul.burton@mips.com> # MIPS parts
Diffstat (limited to 'include/linux/dma-noncoherent.h')
| -rw-r--r-- | include/linux/dma-noncoherent.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/dma-noncoherent.h b/include/linux/dma-noncoherent.h index ce9732506ef4..3f503025a0cd 100644 --- a/include/linux/dma-noncoherent.h +++ b/include/linux/dma-noncoherent.h @@ -24,14 +24,9 @@ void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs); void arch_dma_free(struct device *dev, size_t size, void *cpu_addr, dma_addr_t dma_addr, unsigned long attrs); - -#ifdef CONFIG_DMA_NONCOHERENT_MMAP int arch_dma_mmap(struct device *dev, struct vm_area_struct *vma, void *cpu_addr, dma_addr_t dma_addr, size_t size, unsigned long attrs); -#else -#define arch_dma_mmap NULL -#endif /* CONFIG_DMA_NONCOHERENT_MMAP */ #ifdef CONFIG_DMA_NONCOHERENT_CACHE_SYNC void arch_dma_cache_sync(struct device *dev, void *vaddr, size_t size, |