diff options
author | Oleg Nesterov <oleg@redhat.com> | 2012-08-08 11:17:46 -0400 |
---|---|---|
committer | Oleg Nesterov <oleg@redhat.com> | 2012-08-28 12:21:19 -0400 |
commit | 61559a8165da2b6bab7621ac36379c6280efacb6 (patch) | |
tree | 22d885fda72ffadbaa735ceeeabd266177d66eab /include/linux/uprobes.h | |
parent | f8ac4ec9c064b330dcc49e03c450fe74298c4622 (diff) |
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 'include/linux/uprobes.h')
-rw-r--r-- | include/linux/uprobes.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h index 4a37ab153247..30297f95c8af 100644 --- a/include/linux/uprobes.h +++ b/include/linux/uprobes.h | |||
@@ -118,7 +118,6 @@ extern void uprobe_notify_resume(struct pt_regs *regs); | |||
118 | extern bool uprobe_deny_signal(void); | 118 | extern bool uprobe_deny_signal(void); |
119 | extern bool __weak arch_uprobe_skip_sstep(struct arch_uprobe *aup, struct pt_regs *regs); | 119 | extern bool __weak arch_uprobe_skip_sstep(struct arch_uprobe *aup, struct pt_regs *regs); |
120 | extern void uprobe_clear_state(struct mm_struct *mm); | 120 | extern void uprobe_clear_state(struct mm_struct *mm); |
121 | extern void uprobe_reset_state(struct mm_struct *mm); | ||
122 | #else /* !CONFIG_UPROBES */ | 121 | #else /* !CONFIG_UPROBES */ |
123 | struct uprobes_state { | 122 | struct uprobes_state { |
124 | }; | 123 | }; |
@@ -163,8 +162,5 @@ static inline void uprobe_copy_process(struct task_struct *t) | |||
163 | static inline void uprobe_clear_state(struct mm_struct *mm) | 162 | static inline void uprobe_clear_state(struct mm_struct *mm) |
164 | { | 163 | { |
165 | } | 164 | } |
166 | static inline void uprobe_reset_state(struct mm_struct *mm) | ||
167 | { | ||
168 | } | ||
169 | #endif /* !CONFIG_UPROBES */ | 165 | #endif /* !CONFIG_UPROBES */ |
170 | #endif /* _LINUX_UPROBES_H */ | 166 | #endif /* _LINUX_UPROBES_H */ |