Merge branch 'linux-5.1' of git://github.com/skeggsb/linux into drm-fixes

[muen/linux.git] / drivers / gpu / drm / nouveau / nouveau_dmem.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nouveau/nouveau_dmem.c
index 61fc27d30ff2f54d30ca4e0e534007e98e17fb5d..40c47d6a7d783d72c869937b2a6ad946086a20cf 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_dmem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_dmem.c
@@ -259,7 +259,7 @@ static const struct migrate_vma_ops nouveau_dmem_fault_migrate_ops = {
        .finalize_and_map       = nouveau_dmem_fault_finalize_and_map,
 };
 
-static int
+static vm_fault_t
 nouveau_dmem_fault(struct hmm_devmem *devmem,
                   struct vm_area_struct *vma,
                   unsigned long addr,