gpu: drm: vgem: Change return type to vm_fault_t
authorSouptick Joarder <jrdr.linux@gmail.com>
Mon, 16 Apr 2018 15:02:32 +0000 (20:32 +0530)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 24 May 2018 12:56:57 +0000 (14:56 +0200)
Use new return type vm_fault_t for fault handler.

Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
Reviewed-by: Matthew Wilcox <mawilcox@microsoft.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20180416150232.GA26745@jordon-HP-15-Notebook-PC
drivers/gpu/drm/vgem/vgem_drv.c

index 2524ff116f00d922267213d1a4f8554172057400..c64a85950c8293fc39e7a42863460d12cb769253 100644 (file)
@@ -61,13 +61,13 @@ static void vgem_gem_free_object(struct drm_gem_object *obj)
        kfree(vgem_obj);
 }
 
-static int vgem_gem_fault(struct vm_fault *vmf)
+static vm_fault_t vgem_gem_fault(struct vm_fault *vmf)
 {
        struct vm_area_struct *vma = vmf->vma;
        struct drm_vgem_gem_object *obj = vma->vm_private_data;
        /* We don't use vmf->pgoff since that has the fake offset */
        unsigned long vaddr = vmf->address;
-       int ret;
+       vm_fault_t ret = VM_FAULT_SIGBUS;
        loff_t num_pages;
        pgoff_t page_offset;
        page_offset = (vaddr - vma->vm_start) >> PAGE_SHIFT;
@@ -77,7 +77,6 @@ static int vgem_gem_fault(struct vm_fault *vmf)
        if (page_offset > num_pages)
                return VM_FAULT_SIGBUS;
 
-       ret = -ENOENT;
        mutex_lock(&obj->pages_lock);
        if (obj->pages) {
                get_page(obj->pages[page_offset]);