From 4f3c9756ddaa06db57cee9369efcad2d61b4a25a Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@redhat.com>
Date: Sun, 29 Jul 2012 20:22:36 +0200
Subject: [PATCH] --- yaml --- r: 320475 b: refs/heads/master c:
 6dab3cc078e3da0d26534410bc9e018a17031d95 h: refs/heads/master i:   320473:
 91d8e66fa1100a96d3ee3117d1067605278e825e   320471:
 859b81ab005ac2e2673de3d248534206180058d1 v: v3

---
 [refs]          | 2 +-
 trunk/mm/mmap.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

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);
 			}