Commit 6c259091 authored by Souptick Joarder's avatar Souptick Joarder Committed by Daniel Vetter

gpu: drm: drm_vm: 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.

commit 1c8f4220 ("mm: change return type to vm_fault_t")
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/20180510134203.GA25166@jordon-HP-15-Notebook-PC
parent d104328c
...@@ -100,7 +100,7 @@ static pgprot_t drm_dma_prot(uint32_t map_type, struct vm_area_struct *vma) ...@@ -100,7 +100,7 @@ static pgprot_t drm_dma_prot(uint32_t map_type, struct vm_area_struct *vma)
* map, get the page, increment the use count and return it. * map, get the page, increment the use count and return it.
*/ */
#if IS_ENABLED(CONFIG_AGP) #if IS_ENABLED(CONFIG_AGP)
static int drm_vm_fault(struct vm_fault *vmf) static vm_fault_t drm_vm_fault(struct vm_fault *vmf)
{ {
struct vm_area_struct *vma = vmf->vma; struct vm_area_struct *vma = vmf->vma;
struct drm_file *priv = vma->vm_file->private_data; struct drm_file *priv = vma->vm_file->private_data;
...@@ -173,7 +173,7 @@ static int drm_vm_fault(struct vm_fault *vmf) ...@@ -173,7 +173,7 @@ static int drm_vm_fault(struct vm_fault *vmf)
return VM_FAULT_SIGBUS; /* Disallow mremap */ return VM_FAULT_SIGBUS; /* Disallow mremap */
} }
#else #else
static int drm_vm_fault(struct vm_fault *vmf) static vm_fault_t drm_vm_fault(struct vm_fault *vmf)
{ {
return VM_FAULT_SIGBUS; return VM_FAULT_SIGBUS;
} }
...@@ -189,7 +189,7 @@ static int drm_vm_fault(struct vm_fault *vmf) ...@@ -189,7 +189,7 @@ static int drm_vm_fault(struct vm_fault *vmf)
* Get the mapping, find the real physical page to map, get the page, and * Get the mapping, find the real physical page to map, get the page, and
* return it. * return it.
*/ */
static int drm_vm_shm_fault(struct vm_fault *vmf) static vm_fault_t drm_vm_shm_fault(struct vm_fault *vmf)
{ {
struct vm_area_struct *vma = vmf->vma; struct vm_area_struct *vma = vmf->vma;
struct drm_local_map *map = vma->vm_private_data; struct drm_local_map *map = vma->vm_private_data;
...@@ -291,7 +291,7 @@ static void drm_vm_shm_close(struct vm_area_struct *vma) ...@@ -291,7 +291,7 @@ static void drm_vm_shm_close(struct vm_area_struct *vma)
* *
* Determine the page number from the page offset and get it from drm_device_dma::pagelist. * Determine the page number from the page offset and get it from drm_device_dma::pagelist.
*/ */
static int drm_vm_dma_fault(struct vm_fault *vmf) static vm_fault_t drm_vm_dma_fault(struct vm_fault *vmf)
{ {
struct vm_area_struct *vma = vmf->vma; struct vm_area_struct *vma = vmf->vma;
struct drm_file *priv = vma->vm_file->private_data; struct drm_file *priv = vma->vm_file->private_data;
...@@ -326,7 +326,7 @@ static int drm_vm_dma_fault(struct vm_fault *vmf) ...@@ -326,7 +326,7 @@ static int drm_vm_dma_fault(struct vm_fault *vmf)
* *
* Determine the map offset from the page offset and get it from drm_sg_mem::pagelist. * Determine the map offset from the page offset and get it from drm_sg_mem::pagelist.
*/ */
static int drm_vm_sg_fault(struct vm_fault *vmf) static vm_fault_t drm_vm_sg_fault(struct vm_fault *vmf)
{ {
struct vm_area_struct *vma = vmf->vma; struct vm_area_struct *vma = vmf->vma;
struct drm_local_map *map = vma->vm_private_data; struct drm_local_map *map = vma->vm_private_data;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment