Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4c157d8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm64: Enable dma_mmap_nonconsistent" into msm-4.9

parents e6a655ae c4a72b1d

include/linux/dma-mapping.h

+3 −1
Original line number Diff line number Diff line
@@ -855,7 +855,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;

	unsigned long attrs = DMA_ATTR_NON_CONSISTENT;



	return dma_mmap_attrs(dev, vma, cpu_addr, dma_addr, size, attrs);

}



#if defined(CONFIG_NEED_DMA_MAP_STATE) || defined(CONFIG_DMA_API_DEBUG)