Merge branch 'work.get_user_pages_fast' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / drivers / rapidio / devices / rio_mport_cdev.c

diff --git a/drivers/rapidio/devices/rio_mport_cdev.c b/drivers/rapidio/devices/rio_mport_cdev.c
index 5c1b6388122ad8502933ae9878f12f3419204be2..665d9e94a7e1bee135b6e046d8e27a15579fee5d 100644 (file)
--- a/drivers/rapidio/devices/rio_mport_cdev.c
+++ b/drivers/rapidio/devices/rio_mport_cdev.c
@@ -889,11 +889,9 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode,
                        goto err_req;
                }
 
-               pinned = get_user_pages_unlocked(
+               pinned = get_user_pages_fast(
                                (unsigned long)xfer->loc_addr & PAGE_MASK,
-                               nr_pages,
-                               page_list,
-                               dir == DMA_FROM_DEVICE ? FOLL_WRITE : 0);
+                               nr_pages, dir == DMA_FROM_DEVICE, page_list);
 
                if (pinned != nr_pages) {
                        if (pinned < 0) {