diff options
| author | Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com> | 2014-06-06 07:35:20 +0900 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-06-06 04:53:39 -0400 |
| commit | 748ec3a20eb44fce19af3cef04f8db8a8e7aead3 (patch) | |
| tree | 42c864429c252b68d5ffd2e9af7be05a63e1521c /kernel | |
| parent | dc81e5e3abb9f98a3cb6f269c0bee595b2c1235d (diff) | |
| download | linux-748ec3a20eb44fce19af3cef04f8db8a8e7aead3.tar.gz linux-748ec3a20eb44fce19af3cef04f8db8a8e7aead3.tar.bz2 linux-748ec3a20eb44fce19af3cef04f8db8a8e7aead3.zip | |
tracing/kprobes: Avoid self tests if tracing is disabled on boot up
If tracing is disabled on boot up, the kernel should not execute tracing
self tests. The kernel should check whether tracing is disabled or not
before executing any of the tracing self tests.
Link: http://lkml.kernel.org/p/20140605223520.32311.56097.stgit@yunodevel
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.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, 3 insertions, 0 deletions
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 903ae28962be..ef2fba1f46b5 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -1377,6 +1377,9 @@ static __init int kprobe_trace_self_tests_init(void) struct trace_kprobe *tk; struct ftrace_event_file *file; + if (tracing_is_disabled()) + return -ENODEV; + target = kprobe_trace_selftest_target; pr_info("Testing kprobe tracing: "); |