diff options
| author | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2017-12-29 17:49:13 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2017-12-29 17:49:13 +0100 |
| commit | 70a02f840c5113cd9255ce4c1b1848bb48b0bd21 (patch) | |
| tree | 1cd859500e4db4f4c44dadd908ce88c9b3f2a2b6 /drivers/virt | |
| parent | 5f215d252496543ba22299bccef5062d30d63cfe (diff) | |
| parent | 464e1d5f23cca236b930ef068c328a64cab78fb1 (diff) | |
| download | linux-70a02f840c5113cd9255ce4c1b1848bb48b0bd21.tar.bz2 | |
Merge tag 'v4.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next
Linux 4.15-rc5
Diffstat (limited to 'drivers/virt')
| -rw-r--r-- | drivers/virt/fsl_hypervisor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/virt/fsl_hypervisor.c b/drivers/virt/fsl_hypervisor.c index d993df5586c0..d70ad6d38879 100644 --- a/drivers/virt/fsl_hypervisor.c +++ b/drivers/virt/fsl_hypervisor.c @@ -243,8 +243,8 @@ static long ioctl_memcpy(struct fsl_hv_ioctl_memcpy __user *p) sg_list = PTR_ALIGN(sg_list_unaligned, sizeof(struct fh_sg_list)); /* Get the physical addresses of the source buffer */ - num_pinned = get_user_pages_unlocked(param.local_vaddr - lb_offset, - num_pages, pages, (param.source == -1) ? 0 : FOLL_WRITE); + num_pinned = get_user_pages_fast(param.local_vaddr - lb_offset, + num_pages, param.source != -1, pages); if (num_pinned != num_pages) { /* get_user_pages() failed */ |