aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorMuhammad Falak R Wani <falakreyaz@gmail.com>2016-05-21 09:22:22 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-08-31 09:13:56 -0400
commit95da00e35acf92bb5d39f6f08267de0c1a5c8885 (patch)
tree32d7a3671623c2dda55f17febfcf1fdb2630955f /drivers/base
parente688f144305c678fb65138d9e6b6ce436e59778b (diff)
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 <falakreyaz@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/dma-mapping.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/dma-mapping.c b/drivers/base/dma-mapping.c
index 261420ddfe66..2e318ffa019e 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,
247{ 247{
248 int ret = -ENXIO; 248 int ret = -ENXIO;
249#if defined(CONFIG_MMU) && !defined(CONFIG_ARCH_NO_COHERENT_DMA_MMAP) 249#if defined(CONFIG_MMU) && !defined(CONFIG_ARCH_NO_COHERENT_DMA_MMAP)
250 unsigned long user_count = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; 250 unsigned long user_count = vma_pages(vma);
251 unsigned long count = PAGE_ALIGN(size) >> PAGE_SHIFT; 251 unsigned long count = PAGE_ALIGN(size) >> PAGE_SHIFT;
252 unsigned long pfn = page_to_pfn(virt_to_page(cpu_addr)); 252 unsigned long pfn = page_to_pfn(virt_to_page(cpu_addr));
253 unsigned long off = vma->vm_pgoff; 253 unsigned long off = vma->vm_pgoff;