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

[karo-tx-linux.git] / kernel / trace / ftrace.c

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 867bd1dd2dd09250f3a52663844ee1b54435bbd3..0fa92f677c9209e2ed046752752de986e34f071e 100644 (file)
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -249,7 +249,8 @@ static void update_ftrace_function(void)
 #else
        __ftrace_trace_function = func;
 #endif
-       ftrace_trace_function = ftrace_test_stop_func;
+       ftrace_trace_function =
+               (func == ftrace_stub) ? func : ftrace_test_stop_func;
 #endif
 }