From: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Date: Mon, 12 Dec 2016 08:31:18 +0000 (+0100)
Subject: ARM: 8633/1: nommu: allow mmap when !CONFIG_MMU
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=79964a1c2972ca7ecc231e2d2ac7593a1af73f63;p=openwrt%2Fstaging%2Fblogic.git

ARM: 8633/1: nommu: allow mmap when !CONFIG_MMU

commit ab6494f0c96f ("nommu: Add noMMU support to the DMA API") have
add CONFIG_MMU compilation flag but that prohibit to use dma_mmap_wc()
when the platform doesn't have MMU.

This patch call vm_iomap_memory() in noMMU case to test if addresses
are correct and set vma->vm_flags rather than all return an error.

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index ab7710002ba6..afa64ed5e36b 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -868,6 +868,9 @@ static int __arm_dma_mmap(struct device *dev, struct vm_area_struct *vma,
 				      vma->vm_end - vma->vm_start,
 				      vma->vm_page_prot);
 	}
+#else
+	ret = vm_iomap_memory(vma, vma->vm_start,
+			      (vma->vm_end - vma->vm_start));
 #endif	/* CONFIG_MMU */
 
 	return ret;