summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2013-10-27 21:52:17 +0000
committerDave Airlie <airlied@redhat.com>2013-11-06 13:23:12 +1000
commitbc212b9cf808add5b1e7a6913b10b1802c270c3c (patch)
treef7840e95da4b5bee3ba96aad1c194b3eb9518ed4
parent1dda6805471d4120dba2fa0f2cc1053c2dab28de (diff)
downloadtalos-op-linux-bc212b9cf808add5b1e7a6913b10b1802c270c3c.tar.gz
talos-op-linux-bc212b9cf808add5b1e7a6913b10b1802c270c3c.zip
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 <ben@decadent.org.uk> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/drm_vm.c2
1 files changed, 1 insertions, 1 deletions
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;
OpenPOWER on IntegriCloud