Messages in this thread | | | From | Nick Piggin <> | Subject | Re: [PATCH 3/3] uio: vm_operations_struct ->nopage to ->fault method conversion | Date | Sat, 2 Feb 2008 21:37:45 +1100 |
| |
On Saturday 02 February 2008 20:51, Denis Cheng wrote: > Signed-off-by: Denis Cheng <crquan@gmail.com>
Thanks, but already patched in -mm.
> --- > drivers/uio/uio.c | 19 ++++++++----------- > 1 files changed, 8 insertions(+), 11 deletions(-) > > diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c > index cc246fa..47e0c32 100644 > --- a/drivers/uio/uio.c > +++ b/drivers/uio/uio.c > @@ -417,30 +417,27 @@ static void uio_vma_close(struct vm_area_struct *vma) > idev->vma_count--; > } > > -static struct page *uio_vma_nopage(struct vm_area_struct *vma, > - unsigned long address, int *type) > +static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf) > { > struct uio_device *idev = vma->vm_private_data; > - struct page* page = NOPAGE_SIGBUS; > > int mi = uio_find_mem_index(vma); > if (mi < 0) > - return page; > + return VM_FAULT_SIGBUS; > > if (idev->info->mem[mi].memtype == UIO_MEM_LOGICAL) > - page = virt_to_page(idev->info->mem[mi].addr); > + vmf->page = virt_to_page(idev->info->mem[mi].addr); > else > - page = vmalloc_to_page((void*)idev->info->mem[mi].addr); > - get_page(page); > - if (type) > - *type = VM_FAULT_MINOR; > - return page; > + vmf->page = vmalloc_to_page((void *)idev->info->mem[mi].addr); > + get_page(vmf->page); > + > + return 0; > } > > static struct vm_operations_struct uio_vm_ops = { > .open = uio_vma_open, > .close = uio_vma_close, > - .nopage = uio_vma_nopage, > + .fault = uio_vma_fault, > }; > > static int uio_mmap_physical(struct vm_area_struct *vma)
| |