diff options
| author | Linus Torvalds | 2019-07-17 20:23:13 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2019-07-17 20:23:13 +0200 |
| commit | 37d4607ebbbf5d8b74cbcb9434a5ce6897a51864 (patch) | |
| tree | d53055fb96f50898228631b5a784269b76e38dee /drivers/vfio/pci/vfio_pci_nvlink2.c | |
| parent | Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cl... (diff) | |
| parent | mdev: Send uevents around parent device registration (diff) | |
| download | kernel-qcow2-linux-37d4607ebbbf5d8b74cbcb9434a5ce6897a51864.tar.gz kernel-qcow2-linux-37d4607ebbbf5d8b74cbcb9434a5ce6897a51864.tar.xz kernel-qcow2-linux-37d4607ebbbf5d8b74cbcb9434a5ce6897a51864.zip | |
Merge tag 'vfio-v5.3-rc1' of git://github.com/awilliam/linux-vfio
Pull VFIO updates from Alex Williamson:
- Static symbol cleanup in mdev samples (Kefeng Wang)
- Use vma help in nvlink code (Peng Hao)
- Remove unused code in mbochs sample (YueHaibing)
- Send uevents around mdev registration (Alex Williamson)
* tag 'vfio-v5.3-rc1' of git://github.com/awilliam/linux-vfio:
mdev: Send uevents around parent device registration
sample/mdev/mbochs: remove set but not used variable 'mdev_state'
vfio: vfio_pci_nvlink2: use a vma helper function
vfio-mdev/samples: make some symbols static
Diffstat (limited to 'drivers/vfio/pci/vfio_pci_nvlink2.c')
| -rw-r--r-- | drivers/vfio/pci/vfio_pci_nvlink2.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/vfio/pci/vfio_pci_nvlink2.c b/drivers/vfio/pci/vfio_pci_nvlink2.c index 50fe3c4f7feb..f2983f0f84be 100644 --- a/drivers/vfio/pci/vfio_pci_nvlink2.c +++ b/drivers/vfio/pci/vfio_pci_nvlink2.c @@ -161,8 +161,7 @@ static int vfio_pci_nvgpu_mmap(struct vfio_pci_device *vdev, atomic_inc(&data->mm->mm_count); ret = (int) mm_iommu_newdev(data->mm, data->useraddr, - (vma->vm_end - vma->vm_start) >> PAGE_SHIFT, - data->gpu_hpa, &data->mem); + vma_pages(vma), data->gpu_hpa, &data->mem); trace_vfio_pci_nvgpu_mmap(vdev->pdev, data->gpu_hpa, data->useraddr, vma->vm_end - vma->vm_start, ret); |