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>

2 files changed, 3 insertions, 4 deletions

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);