Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-12 00:38:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ieee1394: small cleanup after "nopage"

Browse Source 
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Stefan Richter 2007-12-15 14:04:42 +01:00
parent 61db81214b
commit c7ea990f87
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/ieee1394/dma.c
View File

@ -231,28 +231,20 @@ void dma_region_sync_for_device(struct dma_region *dma, unsigned long offset,
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
/* fault() handler for mmap access */
static int dma_region_pagefault(struct vm_area_struct *vma, static int dma_region_pagefault(struct vm_area_struct *vma,
struct vm_fault *vmf) struct vm_fault *vmf)
{ {
unsigned long kernel_virt_addr;
struct dma_region *dma = (struct dma_region *)vma->vm_private_data; struct dma_region *dma = (struct dma_region *)vma->vm_private_data;
if (!dma->kvirt) if (!dma->kvirt)
goto error; return VM_FAULT_SIGBUS;
if (vmf->pgoff >= dma->n_pages) if (vmf->pgoff >= dma->n_pages)
goto error; return VM_FAULT_SIGBUS;
kernel_virt_addr = (unsigned long)dma->kvirt + (vmf->pgoff << PAGE_SHIFT); vmf->page = vmalloc_to_page(dma->kvirt + (vmf->pgoff << PAGE_SHIFT));
vmf->page = vmalloc_to_page((void *)kernel_virt_addr);
get_page(vmf->page); get_page(vmf->page);
return 0; return 0;
error:
return VM_FAULT_SIGBUS;
} }
static struct vm_operations_struct dma_region_vm_ops = { static struct vm_operations_struct dma_region_vm_ops = {