On Thu, May 10, 2018 at 08:34:48PM +0530, Souptick Joarder wrote: > Use new return type vm_fault_t for fault handler in > struct vm_operations_struct. For now, this is just > documenting that the function returns a VM_FAULT > value rather than an errno. Once all instances are > converted, vm_fault_t will become a distinct type. > > commit 1c8f422059ae ("mm: change return type to vm_fault_t") > > Previously vm_insert_pfn() returns err which driver > mapped into VM_FAULT_* type. The new function > vmf_insert_pfn() will replace this inefficiency by > returning VM_FAULT_* type. > > Signed-off-by: Souptick Joarder <jrdr.linux@xxxxxxxxx> > Reviewed-by: Matthew Wilcox <mawilcox@xxxxxxxxxxxxx> Acked-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxx> Thanks. > --- > v2: Updated the change log > > drivers/gpu/drm/armada/armada_gem.c | 15 ++------------- > 1 file changed, 2 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c > index a97f509..81a55b7 100644 > --- a/drivers/gpu/drm/armada/armada_gem.c > +++ b/drivers/gpu/drm/armada/armada_gem.c > @@ -13,25 +13,14 @@ > #include <drm/armada_drm.h> > #include "armada_ioctlP.h" > > -static int armada_gem_vm_fault(struct vm_fault *vmf) > +static vm_fault_t armada_gem_vm_fault(struct vm_fault *vmf) > { > struct drm_gem_object *gobj = vmf->vma->vm_private_data; > struct armada_gem_object *obj = drm_to_armada_gem(gobj); > unsigned long pfn = obj->phys_addr >> PAGE_SHIFT; > - int ret; > > pfn += (vmf->address - vmf->vma->vm_start) >> PAGE_SHIFT; > - ret = vm_insert_pfn(vmf->vma, vmf->address, pfn); > - > - switch (ret) { > - case 0: > - case -EBUSY: > - return VM_FAULT_NOPAGE; > - case -ENOMEM: > - return VM_FAULT_OOM; > - default: > - return VM_FAULT_SIGBUS; > - } > + return vmf_insert_pfn(vmf->vma, vmf->address, pfn); > } > > const struct vm_operations_struct armada_gem_vm_ops = { > -- > 1.9.1 > -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up According to speedtest.net: 8.21Mbps down 510kbps up _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel