| Message ID | 1382910737.2994.47.camel@deadeye.wl.decadent.org.uk (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c index b5c5af7..8ef6503 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;
By definition, the page offset will not affect the result. Compile-tested only. Signed-off-by: Ben Hutchings <ben@decadent.org.uk> --- drivers/gpu/drm/drm_vm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)