mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite to take only vmf

[mirror_ubuntu-bionic-kernel.git] / drivers / hwtracing / intel_th / msu.c

diff --git a/drivers/hwtracing/intel_th/msu.c b/drivers/hwtracing/intel_th/msu.c
index e8d55a153a654881d4339712872a87e5b407c372..e88afe1a435cc7fc9be0cb15cf7eee8bfcf8ff6e 100644 (file)
--- a/drivers/hwtracing/intel_th/msu.c
+++ b/drivers/hwtracing/intel_th/msu.c
@@ -1188,9 +1188,9 @@ static void msc_mmap_close(struct vm_area_struct *vma)
        mutex_unlock(&msc->buf_mutex);
 }
 
-static int msc_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+static int msc_mmap_fault(struct vm_fault *vmf)
 {
-       struct msc_iter *iter = vma->vm_file->private_data;
+       struct msc_iter *iter = vmf->vma->vm_file->private_data;
        struct msc *msc = iter->msc;
 
        vmf->page = msc_buffer_get_page(msc, vmf->pgoff);
@@ -1198,7 +1198,7 @@ static int msc_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
                return VM_FAULT_SIGBUS;
 
        get_page(vmf->page);
-       vmf->page->mapping = vma->vm_file->f_mapping;
+       vmf->page->mapping = vmf->vma->vm_file->f_mapping;
        vmf->page->index = vmf->pgoff;
 
        return 0;