diff options
| author | Oleg Nesterov <oleg@redhat.com> | 2012-08-08 17:17:46 +0200 |
|---|---|---|
| committer | Anton Arapov <anton@redhat.com> | 2012-10-29 11:22:08 +0100 |
| commit | ec8583cfad22e8856fd4c2020f55d1123e3bcee0 (patch) | |
| tree | 2b0af769b5d22af5f740d8ece0f5328d5f80156f /kernel/events/uprobes.c | |
| parent | 45ef1f95f3d4804f35ce5d87b6a2b4bc1af1d52e (diff) | |
| download | kernel-uprobes-ec8583cfad22e8856fd4c2020f55d1123e3bcee0.tar.gz kernel-uprobes-ec8583cfad22e8856fd4c2020f55d1123e3bcee0.tar.xz kernel-uprobes-ec8583cfad22e8856fd4c2020f55d1123e3bcee0.zip | |
uprobes: Fold uprobe_reset_state() into uprobe_dup_mmap()
Now that we have uprobe_dup_mmap() we can fold uprobe_reset_state()
into the new hook and remove it. mmput()->uprobe_clear_state() can't
be called before dup_mmap().
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Diffstat (limited to 'kernel/events/uprobes.c')
| -rw-r--r-- | kernel/events/uprobes.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 33870b17e1d..610e1c8050c 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -1148,16 +1148,10 @@ void uprobe_clear_state(struct mm_struct *mm) kfree(area); } -/* - * uprobe_reset_state - Free the area allocated for slots. - */ -void uprobe_reset_state(struct mm_struct *mm) -{ - mm->uprobes_state.xol_area = NULL; -} - void uprobe_dup_mmap(struct mm_struct *oldmm, struct mm_struct *newmm) { + newmm->uprobes_state.xol_area = NULL; + if (test_bit(MMF_HAS_UPROBES, &oldmm->flags)) set_bit(MMF_HAS_UPROBES, &newmm->flags); } |