ftrace: x86: Remove check of obsolete variable function_trace_stop

Nothing sets function_trace_stop to disable function tracing anymore.
Remove the check for it in the arch code.

Link: http://lkml.kernel.org/r/53C54D32.6000000@zytor.com

Acked-by: H. Peter Anvin <hpa@linux.intel.com>
Reviewed-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

1 files changed, 1 insertions, 17 deletions

diff --git a/arch/x86/kernel/mcount_64.S b/arch/x86/kernel/mcount_64.S
index 6b4e3c3b3d74..c73aecf10d34 100644
--- a/arch/x86/kernel/mcount_64.S
+++ b/arch/x86/kernel/mcount_64.S
@@ -46,10 +46,6 @@ END(function_hook)
 .endm
 
 ENTRY(ftrace_caller)
-        /* Check if tracing was disabled (quick check) */
-        cmpl $0, function_trace_stop
-        jne  ftrace_stub
-
         ftrace_caller_setup
         /* regs go into 4th parameter (but make it NULL) */
         movq $0, %rcx
@@ -73,10 +69,6 @@ ENTRY(ftrace_regs_caller)
         /* Save the current flags before compare (in SS location)*/
         pushfq
 
-        /* Check if tracing was disabled (quick check) */
-        cmpl $0, function_trace_stop
-        jne  ftrace_restore_flags
-
         /* skip=8 to skip flags saved in SS */
         ftrace_caller_setup 8
 
@@ -131,7 +123,7 @@ GLOBAL(ftrace_regs_call)
         popfq
 
         jmp ftrace_return
-ftrace_restore_flags:
+
         popfq
         jmp  ftrace_stub
 
@@ -141,9 +133,6 @@ END(ftrace_regs_caller)
 #else /* ! CONFIG_DYNAMIC_FTRACE */
 
 ENTRY(function_hook)
-        cmpl $0, function_trace_stop
-        jne  ftrace_stub
-
         cmpq $ftrace_stub, ftrace_trace_function
         jnz trace
 
@@ -182,10 +171,6 @@ END(function_hook)
 ENTRY(ftrace_graph_caller)
         MCOUNT_SAVE_FRAME
 
-        /* Check if tracing was disabled (quick check) */
-        cmpl $0, function_trace_stop
-        jne  fgraph_skip
-
 #ifdef CC_USING_FENTRY
         leaq SS+16(%rsp), %rdi
         movq $0, %rdx   /* No framepointers needed */
@@ -198,7 +183,6 @@ ENTRY(ftrace_graph_caller)
 
         call    prepare_ftrace_return
 
-fgraph_skip:
         MCOUNT_RESTORE_FRAME
 
         retq