From dba6d26bba10745863fd2b2e1a538ba2bd2fac8a Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Sun, 29 Jul 2012 20:22:38 +0200 Subject: [PATCH] --- yaml --- r: 320476 b: refs/heads/master c: 89133786f9408d53361874a8c784fff150fc7f7c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/mmap.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 510b4da8d84c..3ee09fd92bda 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6dab3cc078e3da0d26534410bc9e018a17031d95 +refs/heads/master: 89133786f9408d53361874a8c784fff150fc7f7c diff --git a/trunk/mm/mmap.c b/trunk/mm/mmap.c index e5a46149d1f1..4fe2697339ed 100644 --- a/trunk/mm/mmap.c +++ b/trunk/mm/mmap.c @@ -2345,9 +2345,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; }