]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
drm: use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT
authorLibin <huawei.libin@huawei.com>
Mon, 15 Apr 2013 12:48:57 +0000 (20:48 +0800)
committerDave Airlie <airlied@redhat.com>
Tue, 16 Apr 2013 03:14:00 +0000 (13:14 +1000)
(*->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 <huawei.libin@huawei.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/ttm/ttm_bo_vm.c

index 74705f329d992cb2a52b1f43f98ac0b4afe2155e..3df9f16b041cb214cc5570f890af2e892c25ac7e 100644 (file)
@@ -147,7 +147,7 @@ static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 
        page_offset = ((address - vma->vm_start) >> PAGE_SHIFT) +
            bo->vm_node->start - vma->vm_pgoff;
-       page_last = ((vma->vm_end - vma->vm_start) >> PAGE_SHIFT) +
+       page_last = vma_pages(vma) +
            bo->vm_node->start - vma->vm_pgoff;
 
        if (unlikely(page_offset >= bo->num_pages)) {
@@ -258,7 +258,7 @@ int ttm_bo_mmap(struct file *filp, struct vm_area_struct *vma,
 
        read_lock(&bdev->vm_lock);
        bo = ttm_bo_vm_lookup_rb(bdev, vma->vm_pgoff,
-                                (vma->vm_end - vma->vm_start) >> PAGE_SHIFT);
+                                vma_pages(vma));
        if (likely(bo != NULL) && !kref_get_unless_zero(&bo->kref))
                bo = NULL;
        read_unlock(&bdev->vm_lock);