diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-23 21:48:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-23 21:48:41 -0700 |
| commit | 7ca63ee1b005623af7c4f3481a2976de3b9fed53 (patch) | |
| tree | 43095ed12f75a7930e91625ea974b61e9664d2bc /mm | |
| parent | caf1aaf6d20684f532099c242a18ad3f46cf7a17 (diff) | |
| parent | f5042d037544215de530a375431c3fca60140823 (diff) | |
| download | linux-3.10-7ca63ee1b005623af7c4f3481a2976de3b9fed53.tar.gz linux-3.10-7ca63ee1b005623af7c4f3481a2976de3b9fed53.tar.bz2 linux-3.10-7ca63ee1b005623af7c4f3481a2976de3b9fed53.zip | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"This tree contains misc fixlets: a perf script python binding fix, a
uprobes fix and a syscall tracing fix."
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf tools: Add missing files to build the python binding
uprobes: Fix mmap_region()'s mm->mm_rb corruption if uprobe_mmap() fails
tracing/syscalls: Fix perf syscall tracing when syscall_nr == -1
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/mmap.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mm/mmap.c b/mm/mmap.c index 9adee9fc0d8..ae18a48e7e4 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1356,9 +1356,8 @@ out: } else if ((flags & MAP_POPULATE) && !(flags & MAP_NONBLOCK)) make_pages_present(addr, addr + len); - if (file && uprobe_mmap(vma)) - /* matching probes but cannot insert */ - goto unmap_and_free_vma; + if (file) + uprobe_mmap(vma); return addr; |