Merge tag 'v4.6-rc1' into for-linus-4.6

[mirror_ubuntu-artful-kernel.git] / mm / frame_vector.c

diff --git a/mm/frame_vector.c b/mm/frame_vector.c
index 7cf2b7163222b1d304ba1a4dde0604c5f29a3bbd..381bb07ed14f2271e487fb98d0e95f6ff5470750 100644 (file)
--- a/mm/frame_vector.c
+++ b/mm/frame_vector.c
@@ -58,7 +58,7 @@ int get_vaddr_frames(unsigned long start, unsigned int nr_frames,
        if (!(vma->vm_flags & (VM_IO | VM_PFNMAP))) {
                vec->got_ref = true;
                vec->is_pfns = false;
-               ret = get_user_pages_locked(current, mm, start, nr_frames,
+               ret = get_user_pages_locked(start, nr_frames,
                        write, force, (struct page **)(vec->ptrs), &locked);
                goto out;
        }