Merge branch 'radeon-gem-cs' into modesetting-gem

[android-x86/external-libdrm.git] / linux-core / drm_vm.c

diff --git a/linux-core/drm_vm.c b/linux-core/drm_vm.c
index 9a21516..0aabf94 100644 (file)
--- a/linux-core/drm_vm.c
+++ b/linux-core/drm_vm.c
@@ -698,7 +698,7 @@ EXPORT_SYMBOL(drm_mmap);
  * protected by the bo->mutex lock.
  */
 
-#ifdef DRM_FULL_MM_COMPAT
+#if defined(DRM_FULL_MM_COMPAT) && !defined(DRM_NO_FAULT)
 static int drm_bo_vm_fault(struct vm_area_struct *vma,
                                     struct vm_fault *vmf)
 {
@@ -715,6 +715,7 @@ static int drm_bo_vm_fault(struct vm_area_struct *vma,
        unsigned long ret = VM_FAULT_NOPAGE;
 
        dev = bo->dev;
+
        err = mutex_lock_interruptible(&bo->mutex);
        if (err) {
                return VM_FAULT_NOPAGE;