Merge tag 'powerpc-4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[mirror_ubuntu-artful-kernel.git] / drivers / misc / cxl / context.c

diff --git a/drivers/misc/cxl/context.c b/drivers/misc/cxl/context.c
index ff5e7e8cb1d151f32bc04e813b7ba05f531e04d2..3907387b6d1564c5ffc7a7fbcc17a6402d1aaf68 100644 (file)
--- a/drivers/misc/cxl/context.c
+++ b/drivers/misc/cxl/context.c
@@ -124,13 +124,12 @@ void cxl_context_set_mapping(struct cxl_context *ctx,
 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;
@@ -162,7 +161,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);