mm: use vmf->address instead of of vmf->virtual_address

Every single user of vmf->virtual_address typed that entry to unsigned
long before doing anything with it so the type of virtual_address does
not really provide us any additional safety.  Just use masked
vmf->address which already has the appropriate type.

Link: http://lkml.kernel.org/r/1479460644-25076-3-git-send-email-jack@suse.cz
Signed-off-by: Jan Kara <jack@suse.cz>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

22 files changed, 46 insertions, 63 deletions

diff --git a/drivers/char/agp/alpha-agp.c b/drivers/char/agp/alpha-agp.c
index 199b8e99f7d7..737187865269 100644
--- a/drivers/char/agp/alpha-agp.c
+++ b/drivers/char/agp/alpha-agp.c
@@ -19,8 +19,7 @@ static int alpha_core_agp_vm_fault(struct vm_area_struct *vma,
         unsigned long pa;
         struct page *page;
 
-        dma_addr = (unsigned long)vmf->virtual_address - vma->vm_start
-                                                + agp->aperture.bus_base;
+        dma_addr = vmf->address - vma->vm_start + agp->aperture.bus_base;
         pa = agp->ops->translate(agp, dma_addr);
 
         if (pa == (unsigned long)-EINVAL)
diff --git a/drivers/char/mspec.c b/drivers/char/mspec.c
index f3f92d5fcda0..a697ca0cab1e 100644
--- a/drivers/char/mspec.c
+++ b/drivers/char/mspec.c
@@ -227,7 +227,7 @@ mspec_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
          * be because another thread has installed the pte first, so it
          * is no problem.
          */
-        vm_insert_pfn(vma, (unsigned long)vmf->virtual_address, pfn);
+        vm_insert_pfn(vma, vmf->address, pfn);
 
         return VM_FAULT_NOPAGE;
 }
diff --git a/drivers/dax/dax.c b/drivers/dax/dax.c
index 286447a83dab..26ec39ddf21f 100644
--- a/drivers/dax/dax.c
+++ b/drivers/dax/dax.c
@@ -328,7 +328,6 @@ static phys_addr_t pgoff_to_phys(struct dax_dev *dax_dev, pgoff_t pgoff,
 static int __dax_dev_fault(struct dax_dev *dax_dev, struct vm_area_struct *vma,
                 struct vm_fault *vmf)
 {
-        unsigned long vaddr = (unsigned long) vmf->virtual_address;
         struct device *dev = &dax_dev->dev;
         struct dax_region *dax_region;
         int rc = VM_FAULT_SIGBUS;
@@ -353,7 +352,7 @@ static int __dax_dev_fault(struct dax_dev *dax_dev, struct vm_area_struct *vma,
 
         pfn = phys_to_pfn_t(phys, dax_region->pfn_flags);
 
-        rc = vm_insert_mixed(vma, vaddr, pfn);
+        rc = vm_insert_mixed(vma, vmf->address, pfn);
 
         if (rc == -ENOMEM)
                 return VM_FAULT_OOM;
diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
index 768087ddb046..a293c8be232c 100644
--- a/drivers/gpu/drm/armada/armada_gem.c
+++ b/drivers/gpu/drm/armada/armada_gem.c
@@ -17,12 +17,11 @@
 static int armada_gem_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
         struct armada_gem_object *obj = drm_to_armada_gem(vma->vm_private_data);
-        unsigned long addr = (unsigned long)vmf->virtual_address;
         unsigned long pfn = obj->phys_addr >> PAGE_SHIFT;
         int ret;
 
-        pfn += (addr - vma->vm_start) >> PAGE_SHIFT;
-        ret = vm_insert_pfn(vma, addr, pfn);
+        pfn += (vmf->address - vma->vm_start) >> PAGE_SHIFT;
+        ret = vm_insert_pfn(vma, vmf->address, pfn);
 
         switch (ret) {
         case 0:
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];
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
index 6f5dfabb3096..114dddbd297b 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
@@ -202,15 +202,14 @@ int etnaviv_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         }
 
         /* We don't use vmf->pgoff since that has the fake offset: */
-        pgoff = ((unsigned long)vmf->virtual_address -
-                        vma->vm_start) >> PAGE_SHIFT;
+        pgoff = (vmf->address - vma->vm_start) >> PAGE_SHIFT;
 
         page = pages[pgoff];
 
-        VERB("Inserting %p pfn %lx, pa %lx", vmf->virtual_address,
+        VERB("Inserting %p pfn %lx, pa %lx", (void *)vmf->address,
              page_to_pfn(page), page_to_pfn(page) << PAGE_SHIFT);
 
-        ret = vm_insert_page(vma, (unsigned long)vmf->virtual_address, page);
+        ret = vm_insert_page(vma, vmf->address, page);
 
 out:
         switch (ret) {
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c
index ea7a18230888..57b81460fec8 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_gem.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c
@@ -455,8 +455,7 @@ int exynos_drm_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         pgoff_t page_offset;
         int ret;
 
-        page_offset = ((unsigned long)vmf->virtual_address -
-                        vma->vm_start) >> PAGE_SHIFT;
+        page_offset = (vmf->address - vma->vm_start) >> PAGE_SHIFT;
 
         if (page_offset >= (exynos_gem->size >> PAGE_SHIFT)) {
                 DRM_ERROR("invalid page offset\n");
@@ -465,8 +464,7 @@ int exynos_drm_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         }
 
         pfn = page_to_pfn(exynos_gem->pages[page_offset]);
-        ret = vm_insert_mixed(vma, (unsigned long)vmf->virtual_address,
-                        __pfn_to_pfn_t(pfn, PFN_DEV));
+        ret = vm_insert_mixed(vma, vmf->address, __pfn_to_pfn_t(pfn, PFN_DEV));
 
 out:
         switch (ret) {
diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
index 4071b2d1e8cf..8b44fa542562 100644
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -125,7 +125,7 @@ static int psbfb_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
                                   psbfb->gtt->offset;
 
         page_num = vma_pages(vma);
-        address = (unsigned long)vmf->virtual_address - (vmf->pgoff << PAGE_SHIFT);
+        address = vmf->address - (vmf->pgoff << PAGE_SHIFT);
 
         vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
 
diff --git a/drivers/gpu/drm/gma500/gem.c b/drivers/gpu/drm/gma500/gem.c
index 6d1cb6b370b1..527c62917660 100644
--- a/drivers/gpu/drm/gma500/gem.c
+++ b/drivers/gpu/drm/gma500/gem.c
@@ -197,15 +197,14 @@ int psb_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 
         /* Page relative to the VMA start - we must calculate this ourselves
            because vmf->pgoff is the fake GEM offset */
-        page_offset = ((unsigned long) vmf->virtual_address - vma->vm_start)
-                                >> PAGE_SHIFT;
+        page_offset = (vmf->address - vma->vm_start) >> PAGE_SHIFT;
 
         /* CPU view of the page, don't go via the GART for CPU writes */
         if (r->stolen)
                 pfn = (dev_priv->stolen_base + r->offset) >> PAGE_SHIFT;
         else
                 pfn = page_to_pfn(r->pages[page_offset]);
-        ret = vm_insert_pfn(vma, (unsigned long)vmf->virtual_address, pfn);
+        ret = vm_insert_pfn(vma, vmf->address, pfn);
 
 fail:
         mutex_unlock(&dev_priv->mmap_mutex);
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index d0dcaf35b429..412f3513f269 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1796,8 +1796,7 @@ int i915_gem_fault(struct vm_area_struct *area, struct vm_fault *vmf)
         int ret;
 
         /* We don't use vmf->pgoff since that has the fake offset */
-        page_offset = ((unsigned long)vmf->virtual_address - area->vm_start) >>
-                PAGE_SHIFT;
+        page_offset = (vmf->address - area->vm_start) >> PAGE_SHIFT;
 
         trace_i915_gem_object_fault(obj, page_offset, true, write);
 
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index cd06cfd94687..d8bc59c7e261 100644
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -225,16 +225,14 @@ int msm_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         }
 
         /* We don't use vmf->pgoff since that has the fake offset: */
-        pgoff = ((unsigned long)vmf->virtual_address -
-                        vma->vm_start) >> PAGE_SHIFT;
+        pgoff = (vmf->address - vma->vm_start) >> PAGE_SHIFT;
 
         pfn = page_to_pfn(pages[pgoff]);
 
-        VERB("Inserting %p pfn %lx, pa %lx", vmf->virtual_address,
+        VERB("Inserting %p pfn %lx, pa %lx", (void *)vmf->address,
                         pfn, pfn << PAGE_SHIFT);
 
-        ret = vm_insert_mixed(vma, (unsigned long)vmf->virtual_address,
-                        __pfn_to_pfn_t(pfn, PFN_DEV));
+        ret = vm_insert_mixed(vma, vmf->address, __pfn_to_pfn_t(pfn, PFN_DEV));
 
 out_unlock:
         mutex_unlock(&dev->struct_mutex);
diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c
index d4e1e11466f8..4a90c690f09e 100644
--- a/drivers/gpu/drm/omapdrm/omap_gem.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem.c
@@ -398,8 +398,7 @@ static int fault_1d(struct drm_gem_object *obj,
         pgoff_t pgoff;
 
         /* We don't use vmf->pgoff since that has the fake offset: */
-        pgoff = ((unsigned long)vmf->virtual_address -
-                        vma->vm_start) >> PAGE_SHIFT;
+        pgoff = (vmf->address - vma->vm_start) >> PAGE_SHIFT;
 
         if (omap_obj->pages) {
                 omap_gem_cpu_sync(obj, pgoff);
@@ -409,11 +408,10 @@ static int fault_1d(struct drm_gem_object *obj,
                 pfn = (omap_obj->paddr >> PAGE_SHIFT) + pgoff;
         }
 
-        VERB("Inserting %p pfn %lx, pa %lx", vmf->virtual_address,
+        VERB("Inserting %p pfn %lx, pa %lx", (void *)vmf->address,
                         pfn, pfn << PAGE_SHIFT);
 
-        return vm_insert_mixed(vma, (unsigned long)vmf->virtual_address,
-                        __pfn_to_pfn_t(pfn, PFN_DEV));
+        return vm_insert_mixed(vma, vmf->address, __pfn_to_pfn_t(pfn, PFN_DEV));
 }
 
 /* Special handling for the case of faulting in 2d tiled buffers */
@@ -427,7 +425,7 @@ static int fault_2d(struct drm_gem_object *obj,
         struct page *pages[64];  /* XXX is this too much to have on stack? */
         unsigned long pfn;
         pgoff_t pgoff, base_pgoff;
-        void __user *vaddr;
+        unsigned long vaddr;
         int i, ret, slots;
 
         /*
@@ -447,8 +445,7 @@ static int fault_2d(struct drm_gem_object *obj,
         const int m = 1 + ((omap_obj->width << fmt) / PAGE_SIZE);
 
         /* We don't use vmf->pgoff since that has the fake offset: */
-        pgoff = ((unsigned long)vmf->virtual_address -
-                        vma->vm_start) >> PAGE_SHIFT;
+        pgoff = (vmf->address - vma->vm_start) >> PAGE_SHIFT;
 
         /*
          * Actual address we start mapping at is rounded down to previous slot
@@ -459,7 +456,7 @@ static int fault_2d(struct drm_gem_object *obj,
         /* figure out buffer width in slots */
         slots = omap_obj->width >> priv->usergart[fmt].slot_shift;
 
-        vaddr = vmf->virtual_address - ((pgoff - base_pgoff) << PAGE_SHIFT);
+        vaddr = vmf->address - ((pgoff - base_pgoff) << PAGE_SHIFT);
 
         entry = &priv->usergart[fmt].entry[priv->usergart[fmt].last];
 
@@ -503,12 +500,11 @@ static int fault_2d(struct drm_gem_object *obj,
 
         pfn = entry->paddr >> PAGE_SHIFT;
 
-        VERB("Inserting %p pfn %lx, pa %lx", vmf->virtual_address,
+        VERB("Inserting %p pfn %lx, pa %lx", (void *)vmf->address,
                         pfn, pfn << PAGE_SHIFT);
 
         for (i = n; i > 0; i--) {
-                vm_insert_mixed(vma, (unsigned long)vaddr,
-                                __pfn_to_pfn_t(pfn, PFN_DEV));
+                vm_insert_mixed(vma, vaddr, __pfn_to_pfn_t(pfn, PFN_DEV));
                 pfn += priv->usergart[fmt].stride_pfn;
                 vaddr += PAGE_SIZE * m;
         }
diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
index c08e5279eeac..7d853e6b5ff0 100644
--- a/drivers/gpu/drm/tegra/gem.c
+++ b/drivers/gpu/drm/tegra/gem.c
@@ -452,10 +452,10 @@ static int tegra_bo_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         if (!bo->pages)
                 return VM_FAULT_SIGBUS;
 
-        offset = ((unsigned long)vmf->virtual_address - vma->vm_start) >> PAGE_SHIFT;
+        offset = (vmf->address - vma->vm_start) >> PAGE_SHIFT;
         page = bo->pages[offset];
 
-        err = vm_insert_page(vma, (unsigned long)vmf->virtual_address, page);
+        err = vm_insert_page(vma, vmf->address, page);
         switch (err) {
         case -EAGAIN:
         case 0:
diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c
index 4748aedc933a..68ef993ab431 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_vm.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
@@ -101,7 +101,7 @@ static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         struct page *page;
         int ret;
         int i;
-        unsigned long address = (unsigned long)vmf->virtual_address;
+        unsigned long address = vmf->address;
         int retval = VM_FAULT_NOPAGE;
         struct ttm_mem_type_manager *man =
                 &bdev->man[bo->mem.mem_type];
diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c
index 818e70712b18..3c0c4bd3f750 100644
--- a/drivers/gpu/drm/udl/udl_gem.c
+++ b/drivers/gpu/drm/udl/udl_gem.c
@@ -107,14 +107,13 @@ int udl_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         unsigned int page_offset;
         int ret = 0;
 
-        page_offset = ((unsigned long)vmf->virtual_address - vma->vm_start) >>
-                PAGE_SHIFT;
+        page_offset = (vmf->address - vma->vm_start) >> PAGE_SHIFT;
 
         if (!obj->pages)
                 return VM_FAULT_SIGBUS;
 
         page = obj->pages[page_offset];
-        ret = vm_insert_page(vma, (unsigned long)vmf->virtual_address, page);
+        ret = vm_insert_page(vma, vmf->address, page);
         switch (ret) {
         case -EAGAIN:
         case 0:
diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c
index f36c14729b55..477e07f0ecb6 100644
--- a/drivers/gpu/drm/vgem/vgem_drv.c
+++ b/drivers/gpu/drm/vgem/vgem_drv.c
@@ -54,7 +54,7 @@ static int vgem_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
         struct drm_vgem_gem_object *obj = vma->vm_private_data;
         /* We don't use vmf->pgoff since that has the fake offset */
-        unsigned long vaddr = (unsigned long)vmf->virtual_address;
+        unsigned long vaddr = vmf->address;
         struct page *page;
 
         page = shmem_read_mapping_page(file_inode(obj->base.filp)->i_mapping,
diff --git a/drivers/media/v4l2-core/videobuf-dma-sg.c b/drivers/media/v4l2-core/videobuf-dma-sg.c
index 1db0af6c7f94..ba63ca57ed7e 100644
--- a/drivers/media/v4l2-core/videobuf-dma-sg.c
+++ b/drivers/media/v4l2-core/videobuf-dma-sg.c
@@ -439,13 +439,12 @@ static int videobuf_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         struct page *page;
 
         dprintk(3, "fault: fault @ %08lx [vma %08lx-%08lx]\n",
-                (unsigned long)vmf->virtual_address,
-                vma->vm_start, vma->vm_end);
+                vmf->address, vma->vm_start, vma->vm_end);
 
         page = alloc_page(GFP_USER | __GFP_DMA32);
         if (!page)
                 return VM_FAULT_OOM;
-        clear_user_highpage(page, (unsigned long)vmf->virtual_address);
+        clear_user_highpage(page, vmf->address);
         vmf->page = page;
 
         return 0;
diff --git a/drivers/misc/cxl/context.c b/drivers/misc/cxl/context.c
index 5e506c19108a..5d36dcc7f47e 100644
--- a/drivers/misc/cxl/context.c
+++ b/drivers/misc/cxl/context.c
@@ -117,13 +117,12 @@ int cxl_context_init(struct cxl_context *ctx, struct cxl_afu *afu, bool master,
 static int cxl_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
         struct cxl_context *ctx = vma->vm_file->private_data;
-        unsigned long address = (unsigned long)vmf->virtual_address;
         u64 area, offset;
 
         offset = vmf->pgoff << PAGE_SHIFT;
 
         pr_devel("%s: pe: %i address: 0x%lx offset: 0x%llx\n",
-                        __func__, ctx->pe, address, offset);
+                        __func__, ctx->pe, vmf->address, offset);
 
         if (ctx->afu->current_mode == CXL_MODE_DEDICATED) {
                 area = ctx->afu->psn_phys;
@@ -155,7 +154,7 @@ static int cxl_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
                 return VM_FAULT_SIGBUS;
         }
 
-        vm_insert_pfn(vma, address, (area + offset) >> PAGE_SHIFT);
+        vm_insert_pfn(vma, vmf->address, (area + offset) >> PAGE_SHIFT);
 
         mutex_unlock(&ctx->status_mutex);
 
diff --git a/drivers/misc/sgi-gru/grumain.c b/drivers/misc/sgi-gru/grumain.c
index 33741ad4a74a..af2e077da4b8 100644
--- a/drivers/misc/sgi-gru/grumain.c
+++ b/drivers/misc/sgi-gru/grumain.c
@@ -932,7 +932,7 @@ int gru_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         unsigned long paddr, vaddr;
         unsigned long expires;
 
-        vaddr = (unsigned long)vmf->virtual_address;
+        vaddr = vmf->address;
         gru_dbg(grudev, "vma %p, vaddr 0x%lx (0x%lx)\n",
                 vma, vaddr, GSEG_BASE(vaddr));
         STAT(nopfn);
diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index d5cc3070e83f..b653451843c8 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -882,7 +882,7 @@ static int ion_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         BUG_ON(!buffer->pages || !buffer->pages[vmf->pgoff]);
 
         pfn = page_to_pfn(ion_buffer_page(buffer->pages[vmf->pgoff]));
-        ret = vm_insert_pfn(vma, (unsigned long)vmf->virtual_address, pfn);
+        ret = vm_insert_pfn(vma, vmf->address, pfn);
         mutex_unlock(&buffer->lock);
         if (ret)
                 return VM_FAULT_ERROR;
diff --git a/drivers/staging/lustre/lustre/llite/vvp_io.c b/drivers/staging/lustre/lustre/llite/vvp_io.c
index 0b6d388d8aa4..697cbfbe9374 100644
--- a/drivers/staging/lustre/lustre/llite/vvp_io.c
+++ b/drivers/staging/lustre/lustre/llite/vvp_io.c
@@ -1014,7 +1014,7 @@ static int vvp_io_kernel_fault(struct vvp_fault_io *cfio)
                        "page %p map %p index %lu flags %lx count %u priv %0lx: got addr %p type NOPAGE\n",
                        vmf->page, vmf->page->mapping, vmf->page->index,
                        (long)vmf->page->flags, page_count(vmf->page),
-                       page_private(vmf->page), vmf->virtual_address);
+                       page_private(vmf->page), (void *)vmf->address);
                 if (unlikely(!(cfio->ft_flags & VM_FAULT_LOCKED))) {
                         lock_page(vmf->page);
                         cfio->ft_flags |= VM_FAULT_LOCKED;
@@ -1025,12 +1025,12 @@ static int vvp_io_kernel_fault(struct vvp_fault_io *cfio)
         }
 
         if (cfio->ft_flags & (VM_FAULT_SIGBUS | VM_FAULT_SIGSEGV)) {
-                CDEBUG(D_PAGE, "got addr %p - SIGBUS\n", vmf->virtual_address);
+                CDEBUG(D_PAGE, "got addr %p - SIGBUS\n", (void *)vmf->address);
                 return -EFAULT;
         }
 
         if (cfio->ft_flags & VM_FAULT_OOM) {
-                CDEBUG(D_PAGE, "got addr %p - OOM\n", vmf->virtual_address);
+                CDEBUG(D_PAGE, "got addr %p - OOM\n", (void *)vmf->address);
                 return -ENOMEM;
         }
 
diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c
index 702040fe2001..6e3306f4a525 100644
--- a/drivers/xen/privcmd.c
+++ b/drivers/xen/privcmd.c
@@ -602,7 +602,7 @@ static int privcmd_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
         printk(KERN_DEBUG "privcmd_fault: vma=%p %lx-%lx, pgoff=%lx, uv=%p\n",
                vma, vma->vm_start, vma->vm_end,
-               vmf->pgoff, vmf->virtual_address);
+               vmf->pgoff, (void *)vmf->address);
 
         return VM_FAULT_SIGBUS;
 }