unimore/kernel-hacking-2024-linux-steffo
unimore/kernel-hacking-2024-linux-steffo
1
Fork 0
Code Pull requests 5 Wiki Activity

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

Browse source 
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>
This commit is contained in:
Nick Piggin 2007-12-07 17:57:38 -03:00 committed by Mauro Carvalho Chehab
parent 14e3c152a1
commit 105354a0f0
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/media/video/videobuf-dma-sg.c
View file

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