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

Pull get_user_pages_fast() conversion from Al Viro:
 "A bunch of places switched to get_user_pages_fast()"

* 'work.get_user_pages_fast' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  ceph: use get_user_pages_fast()
  pvr2fs: use get_user_pages_fast()
  atomisp: use get_user_pages_fast()
  st: use get_user_pages_fast()
  via_dmablit(): use get_user_pages_fast()
  fsl_hypervisor: switch to get_user_pages_fast()
  rapidio: switch to get_user_pages_fast()
  vchiq_2835_arm: switch to get_user_pages_fast()
This commit is contained in:
Linus Torvalds 2017-11-17 12:38:51 -08:00
commit a0e136e5da
8 changed files with 20 additions and 36 deletions

View file

@ -238,9 +238,9 @@ via_lock_all_dma_pages(drm_via_sg_info_t *vsg, drm_via_dmablit_t *xfer)
vsg->pages = vzalloc(sizeof(struct page *) * vsg->num_pages);
if (NULL == vsg->pages)
return -ENOMEM;
ret = get_user_pages_unlocked((unsigned long)xfer->mem_addr,
vsg->num_pages, vsg->pages,
(vsg->direction == DMA_FROM_DEVICE) ? FOLL_WRITE : 0);
ret = get_user_pages_fast((unsigned long)xfer->mem_addr,
vsg->num_pages, vsg->direction == DMA_FROM_DEVICE,
vsg->pages);
if (ret != vsg->num_pages) {
if (ret < 0)
return ret;