From: Libin Date: Wed, 19 Jun 2013 00:05:52 +0000 (+1000) Subject: uio: use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT X-Git-Tag: next-20130619~2^2~559 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7b22f771efdab89396bbe56de4ccd32e4b4e8d7b;p=karo-tx-linux.git uio: use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT (*->vm_end - *->vm_start) >> PAGE_SHIFT operation is implemented as a inline funcion vma_pages() in linux/mm.h, so using it. Signed-off-by: Libin Signed-off-by: Andrew Morton --- diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c index b645c47501b4..3b96f18593b3 100644 --- a/drivers/uio/uio.c +++ b/drivers/uio/uio.c @@ -677,7 +677,7 @@ static int uio_mmap(struct file *filep, struct vm_area_struct *vma) if (mi < 0) return -EINVAL; - requested_pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; + requested_pages = vma_pages(vma); actual_pages = ((idev->info->mem[mi].addr & ~PAGE_MASK) + idev->info->mem[mi].size + PAGE_SIZE -1) >> PAGE_SHIFT; if (requested_pages > actual_pages)