[EMAIL PROTECTED] wrote:
> 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;
> }
>
>
This part has changed in kvm.git, so this won't apply to -mm. I ported
it and applied to my tree, so it should arrive in -mm when Andrew
re-fetches.
--
error compiling committee.c: too many arguments to function
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
kvm-devel mailing list
kvm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-devel
