Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[uclinux-h8/linux.git] / drivers / misc / mic / scif / scif_rma.c

diff --git a/drivers/misc/mic/scif/scif_rma.c b/drivers/misc/mic/scif/scif_rma.c
index 6a451bd..e0203b1 100644 (file)
--- a/drivers/misc/mic/scif/scif_rma.c
+++ b/drivers/misc/mic/scif/scif_rma.c
@@ -1394,8 +1394,6 @@ retry:
                }
 
                pinned_pages->nr_pages = get_user_pages(
-                               current,
-                               mm,
                                (u64)addr,
                                nr_pages,
                                !!(prot & SCIF_PROT_WRITE),