drm: Do not include page offset in argument to virt_to_page()
authorBen Hutchings <ben@decadent.org.uk>
Sun, 27 Oct 2013 21:52:17 +0000 (21:52 +0000)
committerDave Airlie <airlied@redhat.com>
Wed, 6 Nov 2013 03:23:12 +0000 (13:23 +1000)
By definition, the page offset will not affect the result.

Compile-tested only.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/drm_vm.c

index b5c5af7..8ef6503 100644 (file)
@@ -301,7 +301,7 @@ static int drm_do_vm_dma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 
        offset = (unsigned long)vmf->virtual_address - vma->vm_start;   /* vm_[pg]off[set] should be 0 */
        page_nr = offset >> PAGE_SHIFT; /* page_nr could just be vmf->pgoff */
-       page = virt_to_page((dma->pagelist[page_nr] + (offset & (~PAGE_MASK))));
+       page = virt_to_page(dma->pagelist[page_nr]);
 
        get_page(page);
        vmf->page = page;