diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-09-05 10:06:08 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-09-05 10:06:08 -0700 |
| commit | 580a7ce8fb5012c0c0afe592bdafd482a3679911 (patch) | |
| tree | 3fb6b00359a63d8d2e33005599046c105956d314 /kernel/fork.c | |
| parent | a17fb8f520c3c662686aa54a86773f354002c7d3 (diff) | |
| parent | e534e871a94ba2e3bfdf0edd3685eb805fc960d8 (diff) | |
Merge branch 'fixes-wakeupgen' into fixes
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 3bd2280d79f..2c8857e1285 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -455,8 +455,8 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) if (retval) goto out; - if (file && uprobe_mmap(tmp)) - goto out; + if (file) + uprobe_mmap(tmp); } /* a new mm has just been created */ arch_dup_mmap(oldmm, mm); |