diff --git a/[refs] b/[refs] index 7e352a3c9d1d..510b4da8d84c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aefd8933d445abf7ff0d4027c624737898827bcd +refs/heads/master: 6dab3cc078e3da0d26534410bc9e018a17031d95 diff --git a/trunk/mm/mmap.c b/trunk/mm/mmap.c index 3edfcdfa42d9..e5a46149d1f1 100644 --- a/trunk/mm/mmap.c +++ b/trunk/mm/mmap.c @@ -2418,9 +2418,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); }