aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSouptick Joarder <jrdr.linux@gmail.com>2018-04-17 09:38:44 -0400
committerGerd Hoffmann <kraxel@redhat.com>2018-05-14 05:01:30 -0400
commit68266f1c08db731fa7c3a0903bf890fc76ce9345 (patch)
tree34731b9d99cf60ca75d0412ec587fa30347aeb4d
parent110ab11d413881395773df29e8bdf5bd3a2164ee (diff)
gpu: drm: qxl: Adding new typedef vm_fault_t
Use new return type vm_fault_t for fault handler. 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. Reference id -> 1c8f422059ae ("mm: change return type to vm_fault_t") Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com> Link: http://patchwork.freedesktop.org/patch/msgid/20180417133844.GA30256@jordon-HP-15-Notebook-PC Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--drivers/gpu/drm/qxl/qxl_ttm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
index ee2340e31f06..86a1fb32f6db 100644
--- a/drivers/gpu/drm/qxl/qxl_ttm.c
+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
@@ -105,16 +105,16 @@ static void qxl_ttm_global_fini(struct qxl_device *qdev)
105static struct vm_operations_struct qxl_ttm_vm_ops; 105static struct vm_operations_struct qxl_ttm_vm_ops;
106static const struct vm_operations_struct *ttm_vm_ops; 106static const struct vm_operations_struct *ttm_vm_ops;
107 107
108static int qxl_ttm_fault(struct vm_fault *vmf) 108static vm_fault_t qxl_ttm_fault(struct vm_fault *vmf)
109{ 109{
110 struct ttm_buffer_object *bo; 110 struct ttm_buffer_object *bo;
111 int r; 111 vm_fault_t ret;
112 112
113 bo = (struct ttm_buffer_object *)vmf->vma->vm_private_data; 113 bo = (struct ttm_buffer_object *)vmf->vma->vm_private_data;
114 if (bo == NULL) 114 if (bo == NULL)
115 return VM_FAULT_NOPAGE; 115 return VM_FAULT_NOPAGE;
116 r = ttm_vm_ops->fault(vmf); 116 ret = ttm_vm_ops->fault(vmf);
117 return r; 117 return ret;
118} 118}
119 119
120int qxl_mmap(struct file *filp, struct vm_area_struct *vma) 120int qxl_mmap(struct file *filp, struct vm_area_struct *vma)