drm/vkms: Use new return type vm_fault_t

Use new return type vm_fault_t for fault handler.

Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180726144549.GA9434@jordon-HP-15-Notebook-PC

diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h
index 75e52d6..813c9d9 100644 (file)
--- a/drivers/gpu/drm/vkms/vkms_drv.h
+++ b/drivers/gpu/drm/vkms/vkms_drv.h
@@ -81,7 +81,7 @@ struct drm_gem_object *vkms_gem_create(struct drm_device *dev,
                                       u32 *handle,
                                       u64 size);
 
-int vkms_gem_fault(struct vm_fault *vmf);
+vm_fault_t vkms_gem_fault(struct vm_fault *vmf);
 
 int vkms_dumb_create(struct drm_file *file, struct drm_device *dev,
                     struct drm_mode_create_dumb *args);

diff --git a/drivers/gpu/drm/vkms/vkms_gem.c b/drivers/gpu/drm/vkms/vkms_gem.c
index a52e883..c55a571 100644 (file)
--- a/drivers/gpu/drm/vkms/vkms_gem.c
+++ b/drivers/gpu/drm/vkms/vkms_gem.c
@@ -45,14 +45,14 @@ void vkms_gem_free_object(struct drm_gem_object *obj)
        kfree(gem);
 }
 
-int vkms_gem_fault(struct vm_fault *vmf)
+vm_fault_t vkms_gem_fault(struct vm_fault *vmf)
 {
        struct vm_area_struct *vma = vmf->vma;
        struct vkms_gem_object *obj = vma->vm_private_data;
        unsigned long vaddr = vmf->address;
        pgoff_t page_offset;
        loff_t num_pages;
-       int ret;
+       vm_fault_t ret = VM_FAULT_SIGBUS;
 
        page_offset = (vaddr - vma->vm_start) >> PAGE_SHIFT;
        num_pages = DIV_ROUND_UP(obj->gem.size, PAGE_SIZE);
@@ -60,7 +60,6 @@ int vkms_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]);