Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (26 commits)
  firewire: fw-sbp2: Use sbp2 device-provided mgt orb timeout for logins
  firewire: fw-sbp2: increase login orb reply timeout, fix "failed to login"
  firewire: replace subtraction with bitwise and
  firewire: fw-core: react on bus resets while the config ROM is being fetched
  firewire: enforce access order between generation and node ID, fix "giving up on config rom"
  firewire: fw-cdev: use device generation, not card generation
  firewire: fw-sbp2: use device generation, not card generation
  firewire: fw-sbp2: try to increase reconnect_hold (speed up reconnection)
  firewire: fw-sbp2: skip unnecessary logout
  firewire vs. ieee1394: clarify MAINTAINERS
  firewire: fw-ohci: Dynamically allocate buffers for DMA descriptors
  firewire: fw-ohci: CycleTooLong interrupt management
  firewire: Fix extraction of source node id
  firewire: fw-ohci: Bug fixes for packet-per-buffer support
  firewire: fw-ohci: Fix for dualbuffer three-or-more buffers
  firewire: fw-sbp2: remove unused misleading macro
  firewire: fw-sbp2: prepare for s/g chaining
  firewire: fw-sbp2: refactor workq and kref handling
  ieee1394: ohci1394: don't schedule IT tasklets on IR events
  ieee1394: sbp2: raise default transfer size limit
  ...

1 files changed, 13 insertions, 26 deletions

diff --git a/drivers/ieee1394/dma.c b/drivers/ieee1394/dma.c
index 7c4eb39b7024..73685e7dc7e4 100644
--- a/drivers/ieee1394/dma.c
+++ b/drivers/ieee1394/dma.c
@@ -231,37 +231,24 @@ void dma_region_sync_for_device(struct dma_region *dma, unsigned long offset,
 
 #ifdef CONFIG_MMU
 
-/* nopage() handler for mmap access */
-
-static struct page *dma_region_pagefault(struct vm_area_struct *area,
-                                         unsigned long address, int *type)
+static int dma_region_pagefault(struct vm_area_struct *vma,
+                                struct vm_fault *vmf)
 {
-        unsigned long offset;
-        unsigned long kernel_virt_addr;
-        struct page *ret = NOPAGE_SIGBUS;
-
-        struct dma_region *dma = (struct dma_region *)area->vm_private_data;
+        struct dma_region *dma = (struct dma_region *)vma->vm_private_data;
 
         if (!dma->kvirt)
-                goto out;
-
-        if ((address < (unsigned long)area->vm_start) ||
-            (address >
-             (unsigned long)area->vm_start + (dma->n_pages << PAGE_SHIFT)))
-                goto out;
-
-        if (type)
-                *type = VM_FAULT_MINOR;
-        offset = address - area->vm_start;
-        kernel_virt_addr = (unsigned long)dma->kvirt + offset;
-        ret = vmalloc_to_page((void *)kernel_virt_addr);
-        get_page(ret);
-      out:
-        return ret;
+                return VM_FAULT_SIGBUS;
+
+        if (vmf->pgoff >= dma->n_pages)
+                return VM_FAULT_SIGBUS;
+
+        vmf->page = vmalloc_to_page(dma->kvirt + (vmf->pgoff << PAGE_SHIFT));
+        get_page(vmf->page);
+        return 0;
 }
 
 static struct vm_operations_struct dma_region_vm_ops = {
-        .nopage = dma_region_pagefault,
+        .fault = dma_region_pagefault,
 };
 
 /**
@@ -275,7 +262,7 @@ int dma_region_mmap(struct dma_region *dma, struct file *file,
         if (!dma->kvirt)
                 return -EINVAL;
 
-        /* must be page-aligned */
+        /* must be page-aligned (XXX: comment is wrong, we could allow pgoff) */
         if (vma->vm_pgoff != 0)
                 return -EINVAL;