1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c
index caa4e4ca616d..bd311c77c254 100644
--- a/drivers/gpu/drm/drm_vm.c
+++ b/drivers/gpu/drm/drm_vm.c
@@ -124,8 +124,7 @@ static int drm_do_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
                  * Using vm_pgoff as a selector forces us to use this unusual
                  * addressing scheme.
                  */
-                resource_size_t offset = (unsigned long)vmf->virtual_address -
-                        vma->vm_start;
+                resource_size_t offset = vmf->address - vma->vm_start;
                 resource_size_t baddr = map->offset + offset;
                 struct drm_agp_mem *agpmem;
                 struct page *page;
@@ -195,7 +194,7 @@ static int drm_do_vm_shm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         if (!map)
                 return VM_FAULT_SIGBUS; /* Nothing allocated */
 
-        offset = (unsigned long)vmf->virtual_address - vma->vm_start;
+        offset = vmf->address - vma->vm_start;
         i = (unsigned long)map->handle + offset;
         page = vmalloc_to_page((void *)i);
         if (!page)
@@ -301,7 +300,8 @@ static int drm_do_vm_dma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         if (!dma->pagelist)
                 return VM_FAULT_SIGBUS; /* Nothing allocated */
 
-        offset = (unsigned long)vmf->virtual_address - vma->vm_start;   /* vm_[pg]off[set] should be 0 */
+        offset = vmf->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((void *)dma->pagelist[page_nr]);
 
@@ -337,7 +337,7 @@ static int drm_do_vm_sg_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         if (!entry->pagelist)
                 return VM_FAULT_SIGBUS; /* Nothing allocated */
 
-        offset = (unsigned long)vmf->virtual_address - vma->vm_start;
+        offset = vmf->address - vma->vm_start;
         map_offset = map->offset - (unsigned long)dev->sg->virtual;
         page_offset = (offset >> PAGE_SHIFT) + (map_offset >> PAGE_SHIFT);
         page = entry->pagelist[page_offset];