Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / kernel / trace / trace_kprobe.c

diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 242e4ec97d94b0e6a983ab0df0ca0b325a4f013f..282f6e4e553988bb6b75a974bb62742d0a80a7e2 100644 (file)
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -1388,6 +1388,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: ");