From: Muhammad Falak R Wani Date: Sat, 21 May 2016 13:22:22 +0000 (+0530) Subject: dma-mapping: use vma_pages(). X-Git-Tag: v4.9-rc1~148^2~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=95da00e35acf92bb5d39f6f08267de0c1a5c8885;p=thirdparty%2Fkernel%2Flinux.git dma-mapping: use vma_pages(). Replace explicit computation of vma page count by a call to vma_pages() Signed-off-by: Muhammad Falak R Wani Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/base/dma-mapping.c b/drivers/base/dma-mapping.c index 261420ddfe66d..2e318ffa019ef 100644 --- a/drivers/base/dma-mapping.c +++ b/drivers/base/dma-mapping.c @@ -247,7 +247,7 @@ int dma_common_mmap(struct device *dev, struct vm_area_struct *vma, { int ret = -ENXIO; #if defined(CONFIG_MMU) && !defined(CONFIG_ARCH_NO_COHERENT_DMA_MMAP) - unsigned long user_count = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; + unsigned long user_count = vma_pages(vma); unsigned long count = PAGE_ALIGN(size) >> PAGE_SHIFT; unsigned long pfn = page_to_pfn(virt_to_page(cpu_addr)); unsigned long off = vma->vm_pgoff;