lkml.org 
[lkml]   [2007]   [Dec]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [patch 05/18] kvm: nopage
npiggin@suse.de 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



\
 
 \ /
  Last update: 2007-12-05 11:43    [from the cache]
©2003-2011 Jasper Spaans