drm/i915: prepare load-detect pipe code for dpms changes

[~andy/linux] / mm / mmap.c

diff --git a/mm/mmap.c b/mm/mmap.c
index 1ee2fd8bc4868c02a72069b223369472a53e1c17..e3e86914f11ad7d664ec73e08c98ee5670ef8e16 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2344,9 +2344,6 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
             security_vm_enough_memory_mm(mm, vma_pages(vma)))
                return -ENOMEM;
 
-       if (vma->vm_file && uprobe_mmap(vma))
-               return -EINVAL;
-
        vma_link(mm, vma, prev, rb_link, rb_parent);
        return 0;
 }
@@ -2417,9 +2414,6 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
                        if (new_vma->vm_file) {
                                get_file(new_vma->vm_file);
 
-                               if (uprobe_mmap(new_vma))
-                                       goto out_free_mempol;
-
                                if (vma->vm_flags & VM_EXECUTABLE)
                                        added_exe_file_vma(mm);
                        }