Message ID | 20180704153014.GA26121@jordon-HP-15-Notebook-PC (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Wed, 4 Jul 2018 21:00:14 +0530 Souptick Joarder <jrdr.linux@gmail.com> wrote: > convert mbochs_region_vm_fault and mbochs_dmabuf_vm_fault > to return vm_fault_t type. > > Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com> > --- > samples/vfio-mdev/mbochs.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/samples/vfio-mdev/mbochs.c b/samples/vfio-mdev/mbochs.c > index 2960e26..7743fbc 100644 > --- a/samples/vfio-mdev/mbochs.c > +++ b/samples/vfio-mdev/mbochs.c > @@ -657,7 +657,7 @@ static void mbochs_put_pages(struct mdev_state *mdev_state) > dev_dbg(dev, "%s: %d pages released\n", __func__, count); > } > > -static int mbochs_region_vm_fault(struct vm_fault *vmf) > +static vm_fault_t mbochs_region_vm_fault(struct vm_fault *vmf) > { > struct vm_area_struct *vma = vmf->vma; > struct mdev_state *mdev_state = vma->vm_private_data; > @@ -695,7 +695,7 @@ static int mbochs_mmap(struct mdev_device *mdev, struct vm_area_struct *vma) > return 0; > } > > -static int mbochs_dmabuf_vm_fault(struct vm_fault *vmf) > +static vm_fault_t mbochs_dmabuf_vm_fault(struct vm_fault *vmf) > { > struct vm_area_struct *vma = vmf->vma; > struct mbochs_dmabuf *dmabuf = vma->vm_private_data; Looks good to me, I'll include this in my vfio for-linus branch for v4.18. Thanks, Alex
diff --git a/samples/vfio-mdev/mbochs.c b/samples/vfio-mdev/mbochs.c index 2960e26..7743fbc 100644 --- a/samples/vfio-mdev/mbochs.c +++ b/samples/vfio-mdev/mbochs.c @@ -657,7 +657,7 @@ static void mbochs_put_pages(struct mdev_state *mdev_state) dev_dbg(dev, "%s: %d pages released\n", __func__, count); } -static int mbochs_region_vm_fault(struct vm_fault *vmf) +static vm_fault_t mbochs_region_vm_fault(struct vm_fault *vmf) { struct vm_area_struct *vma = vmf->vma; struct mdev_state *mdev_state = vma->vm_private_data; @@ -695,7 +695,7 @@ static int mbochs_mmap(struct mdev_device *mdev, struct vm_area_struct *vma) return 0; } -static int mbochs_dmabuf_vm_fault(struct vm_fault *vmf) +static vm_fault_t mbochs_dmabuf_vm_fault(struct vm_fault *vmf) { struct vm_area_struct *vma = vmf->vma; struct mbochs_dmabuf *dmabuf = vma->vm_private_data;
convert mbochs_region_vm_fault and mbochs_dmabuf_vm_fault to return vm_fault_t type. Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com> --- samples/vfio-mdev/mbochs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)