[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <47568011.1080409@qumranet.com>
Date: Wed, 05 Dec 2007 12:40:17 +0200
From: Avi Kivity <avi@...ranet.com>
To: npiggin@...e.de
CC: akpm@...ux-foundation.org, kvm-devel@...ts.sourceforge.net,
linux-kernel@...r.kernel.org
Subject: Re: [patch 05/18] kvm: nopage
npiggin@...e.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists