From: Ben Hutchings Date: Sun, 27 Oct 2013 21:52:17 +0000 (+0000) Subject: drm: Do not include page offset in argument to virt_to_page() X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bc212b9cf808add5b1e7a6913b10b1802c270c3c;p=linux-beck.git drm: Do not include page offset in argument to virt_to_page() By definition, the page offset will not affect the result. Compile-tested only. Signed-off-by: Ben Hutchings Signed-off-by: Dave Airlie --- diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c index b5c5af7328df..8ef6503488e0 100644 --- a/drivers/gpu/drm/drm_vm.c +++ b/drivers/gpu/drm/drm_vm.c @@ -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;