Merge tag 'trace-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...

[deliverable/linux.git] / arch / parisc / kernel / ftrace.c

diff --git a/arch/parisc/kernel/ftrace.c b/arch/parisc/kernel/ftrace.c
index 5512ab32c5e0e9c355b83b28f4453cef68224f27..559d400f93859ac2ffe096006a2099f0b2137e62 100644 (file)
--- a/arch/parisc/kernel/ftrace.c
+++ b/arch/parisc/kernel/ftrace.c
@@ -155,9 +155,6 @@ void ftrace_function_trampoline(unsigned long parent,
 {
        extern ftrace_func_t ftrace_trace_function;
 
-       if (function_trace_stop)
-               return;
-
        if (ftrace_trace_function != ftrace_stub) {
                ftrace_trace_function(parent, self_addr);
                return;