From 32847c2cd1dbf43f2601ca53cdfa643584b2dc64 Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Sat, 15 Dec 2007 14:04:42 +0100 Subject: [PATCH] --- yaml --- r: 80933 b: refs/heads/master c: c7ea990f87f9fbe6a7183c03f7993b3360454834 h: refs/heads/master i: 80931: 2a53db402f1a9bce74a2faa4d84703674b70c028 v: v3 --- [refs] | 2 +- trunk/drivers/ieee1394/dma.c | 16 ++++------------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 26b04dfdb8ec..d5ed5a441a05 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61db81214bcef33a41325bdc436fb515b697fcdb +refs/heads/master: c7ea990f87f9fbe6a7183c03f7993b3360454834 diff --git a/trunk/drivers/ieee1394/dma.c b/trunk/drivers/ieee1394/dma.c index ec024b5d5e5e..73685e7dc7e4 100644 --- a/trunk/drivers/ieee1394/dma.c +++ b/trunk/drivers/ieee1394/dma.c @@ -231,28 +231,20 @@ void dma_region_sync_for_device(struct dma_region *dma, unsigned long offset, #ifdef CONFIG_MMU -/* fault() handler for mmap access */ - 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; if (!dma->kvirt) - goto error; + return VM_FAULT_SIGBUS; 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((void *)kernel_virt_addr); + vmf->page = vmalloc_to_page(dma->kvirt + (vmf->pgoff << PAGE_SHIFT)); get_page(vmf->page); return 0; - - error: - return VM_FAULT_SIGBUS; } static struct vm_operations_struct dma_region_vm_ops = {