Convert KVM from nopage to fault.
@@ -3111,27 +3105,21 @@ out:
return r;
}
-static struct page *kvm_vm_nopage(struct vm_area_struct *vma,
- unsigned long address,
- int *type)
+static int kvm_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
{
struct kvm *kvm = vma->vm_file->private_data;
- unsigned long pgoff;
struct page *page;
- pgoff = ((address - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;
- page = gfn_to_page(kvm, pgoff);
+ page = gfn_to_page(kvm, vmf->pgoff);
if (!page)
- return NOPAGE_SIGBUS;
+ return VM_FAULT_SIGBUS;
get_page(page);
- if (type != NULL)
- *type = VM_FAULT_MINOR;
-
- return page;
+ vmf->page = page;
+ return 0;
}