Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[pandora-kernel.git] / mm / fremap.c

diff --git a/mm/fremap.c b/mm/fremap.c
index 9129013..2805d71 100644 (file)
--- a/mm/fremap.c
+++ b/mm/fremap.c
@@ -238,13 +238,13 @@ get_write_lock:
                        }
                        goto out_freed;
                }
-               mutex_lock(&mapping->i_mmap_mutex);
+               i_mmap_lock_write(mapping);
                flush_dcache_mmap_lock(mapping);
                vma->vm_flags |= VM_NONLINEAR;
                vma_interval_tree_remove(vma, &mapping->i_mmap);
                vma_nonlinear_insert(vma, &mapping->i_mmap_nonlinear);
                flush_dcache_mmap_unlock(mapping);
-               mutex_unlock(&mapping->i_mmap_mutex);
+               i_mmap_unlock_write(mapping);
        }
 
        if (vma->vm_flags & VM_LOCKED) {