V4L/DVB (6748): Subject: v4l: nopage

Convert v4l from nopage to fault.
Remove redundant vma range checks.

Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 8 insertions, 12 deletions

diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c
index 44ee408e145f..eea5b4ecfc3d 100644
--- a/drivers/media/video/videobuf-dma-sg.c
+++ b/drivers/media/video/videobuf-dma-sg.c
@@ -385,30 +385,26 @@ videobuf_vm_close(struct vm_area_struct *vma)
  * now ...).  Bounce buffers don't work very well for the data rates
  * video capture has.
  */
-static struct page*
-videobuf_vm_nopage(struct vm_area_struct *vma, unsigned long vaddr,
-                   int *type)
+static int
+videobuf_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
         struct page *page;
 
-        dprintk(3,"nopage: fault @ %08lx [vma %08lx-%08lx]\n",
-                vaddr,vma->vm_start,vma->vm_end);
-        if (vaddr > vma->vm_end)
-                return NOPAGE_SIGBUS;
+        dprintk(3,"fault: fault @ %08lx [vma %08lx-%08lx]\n",
+                (unsigned long)vmf->virtual_address,vma->vm_start,vma->vm_end);
         page = alloc_page(GFP_USER | __GFP_DMA32);
         if (!page)
-                return NOPAGE_OOM;
+                return VM_FAULT_OOM;
         clear_user_page(page_address(page), vaddr, page);
-        if (type)
-                *type = VM_FAULT_MINOR;
-        return page;
+        vmf->page = page;
+        return 0;
 }
 
 static struct vm_operations_struct videobuf_vm_ops =
 {
         .open     = videobuf_vm_open,
         .close    = videobuf_vm_close,
-        .nopage   = videobuf_vm_nopage,
+        .fault    = videobuf_vm_fault,
 };
 
 /* ---------------------------------------------------------------------