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

Commit 52c2dad9 authored by Libin's avatar Libin Committed by Linus Torvalds
Browse files

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: default avatarLibin <huawei.libin@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ef9f515a

drivers/uio/uio.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -677,7 +677,7 @@ static int uio_mmap(struct file *filep, struct vm_area_struct *vma) 
	if (mi < 0)

	if (mi < 0)

		return -EINVAL;

		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)

	actual_pages = ((idev->info->mem[mi].addr & ~PAGE_MASK)

			+ idev->info->mem[mi].size + PAGE_SIZE -1) >> PAGE_SHIFT;

			+ idev->info->mem[mi].size + PAGE_SIZE -1) >> PAGE_SHIFT;

	if (requested_pages > actual_pages)

	if (requested_pages > actual_pages)