diff options
author | zhangwei(Jovi) <jovi.zhangwei@huawei.com> | 2013-06-13 22:10:38 -0400 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2013-06-19 23:32:08 -0400 |
commit | 195a84d91e92ee3fe571a2086a6db7e17bf5bc7c (patch) | |
tree | dd39d72abecfc8b23f3142d97802ab2a46bbe06d /kernel | |
parent | de7edd31457b626e54a0b2a7e8ff4d65492f01ad (diff) |
tracing/kprobes: Remove unnecessary checking of trace_probe_is_enabled
Since tp->flags assignment was moved into function enable_trace_probe(),
there is no need to use trace_probe_is_enabled to check flags
in the same function.
Remove the unnecessary checking.
Link: http://lkml.kernel.org/r/51BA7B9E.3040807@huawei.com
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Signed-off-by: zhangwei(Jovi) <jovi.zhangwei@huawei.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/trace/trace_kprobe.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 9f46e98ba8f2..f2374172ba7b 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c | |||
@@ -240,8 +240,7 @@ enable_trace_probe(struct trace_probe *tp, struct ftrace_event_file *file) | |||
240 | } else | 240 | } else |
241 | tp->flags |= TP_FLAG_PROFILE; | 241 | tp->flags |= TP_FLAG_PROFILE; |
242 | 242 | ||
243 | if (trace_probe_is_enabled(tp) && trace_probe_is_registered(tp) && | 243 | if (trace_probe_is_registered(tp) && !trace_probe_has_gone(tp)) { |
244 | !trace_probe_has_gone(tp)) { | ||
245 | if (trace_probe_is_return(tp)) | 244 | if (trace_probe_is_return(tp)) |
246 | ret = enable_kretprobe(&tp->rp); | 245 | ret = enable_kretprobe(&tp->rp); |
247 | else | 246 | else |