From: Yoshihiro YUNOMAE Date: Thu, 5 Jun 2014 22:35:20 +0000 (+0900) Subject: tracing/kprobes: Avoid self tests if tracing is disabled on boot up X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=748ec3a20eb44fce19af3cef04f8db8a8e7aead3;p=openwrt%2Fstaging%2Fblogic.git 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 Signed-off-by: Yoshihiro YUNOMAE Signed-off-by: Steven Rostedt --- 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: ");