kprobe/ftrace: bail out if ftrace was killed

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

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index da1710499698b0ed56ea89183d18befda56c0243..96db99c347b3b01bf10ded57ef342d9640d69070 100644 (file)
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -7895,6 +7895,7 @@ void ftrace_kill(void)
        ftrace_disabled = 1;
        ftrace_enabled = 0;
        ftrace_trace_function = ftrace_stub;
+       kprobe_ftrace_kill();
 }
 
 /**