Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d1a4f6d authored by Souptick Joarder's avatar Souptick Joarder Committed by Daniel Vetter
Browse files

gpu: drm: vgem: Change return type to vm_fault_t 



Use new return type vm_fault_t for fault handler.

Signed-off-by: default avatarSouptick Joarder <jrdr.linux@gmail.com>
Reviewed-by: default avatarMatthew Wilcox <mawilcox@microsoft.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20180416150232.GA26745@jordon-HP-15-Notebook-PC
parent 3c5f134a

drivers/gpu/drm/vgem/vgem_drv.c

+2 −3
Original line number Diff line number Diff line
@@ -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]);