From 0ae59a3564a4ecebcd6dfc64ecba09bced3322cb Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Thu, 6 Mar 2014 11:19:54 -0800 Subject: arm64: Enable dma_mmap_nonconsistent Now that the non-consistent behavior is fully integrated into the dma mapping subsystem, allow user space to mmap nonconsistent dma buffers. Change-Id: I1b95ba9a1751e00a5812d9df582af20f316fcafe Signed-off-by: Laura Abbott Conflicts: arch/arm64/include/asm/dma-mapping.h --- include/asm-generic/dma-mapping-common.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/asm-generic/dma-mapping-common.h b/include/asm-generic/dma-mapping-common.h index ac96eeceeb36..3bee2e334ad4 100644 --- a/include/asm-generic/dma-mapping-common.h +++ b/include/asm-generic/dma-mapping-common.h @@ -348,7 +348,9 @@ static inline int dma_mmap_nonconsistent(struct device *dev, struct vm_area_struct *vma, void *cpu_addr, dma_addr_t dma_addr, size_t size) { - return -ENODEV; + DEFINE_DMA_ATTRS(attrs); + dma_set_attr(DMA_ATTR_NON_CONSISTENT, &attrs); + return dma_mmap_attrs(dev, vma, cpu_addr, dma_addr, size, &attrs); } #ifndef HAVE_ARCH_DMA_SUPPORTED -- cgit v1.2.3