diff options
author | Steven Rostedt <srostedt@redhat.com> | 2012-07-03 16:16:09 -0400 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2012-07-31 10:29:51 -0400 |
commit | 5767cfeaa9ec7b67c802143394f3ad9f8b174eb8 (patch) | |
tree | b43cb98420a7e87bb238df930ec712eaeb86ac73 | |
parent | e4ea3f6b1bf3d489674a3660db652636e50186f9 (diff) |
ftrace/x86: Remove function_trace_stop check from graph caller
The graph caller is called by the mcount callers, which already does
the check against the function_trace_stop variable. No reason to
check it again.
Link: http://lkml.kernel.org/r/20120711195745.588538769@goodmis.org
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r-- | arch/x86/kernel/entry_32.S | 3 | ||||
-rw-r--r-- | arch/x86/kernel/entry_64.S | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S index 4dc301709e78..061ac17ee974 100644 --- a/arch/x86/kernel/entry_32.S +++ b/arch/x86/kernel/entry_32.S | |||
@@ -1241,9 +1241,6 @@ END(mcount) | |||
1241 | 1241 | ||
1242 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER | 1242 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER |
1243 | ENTRY(ftrace_graph_caller) | 1243 | ENTRY(ftrace_graph_caller) |
1244 | cmpl $0, function_trace_stop | ||
1245 | jne ftrace_stub | ||
1246 | |||
1247 | pushl %eax | 1244 | pushl %eax |
1248 | pushl %ecx | 1245 | pushl %ecx |
1249 | pushl %edx | 1246 | pushl %edx |
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 52bda2e8f7aa..38308fa7d7e5 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S | |||
@@ -213,9 +213,6 @@ END(mcount) | |||
213 | 213 | ||
214 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER | 214 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER |
215 | ENTRY(ftrace_graph_caller) | 215 | ENTRY(ftrace_graph_caller) |
216 | cmpl $0, function_trace_stop | ||
217 | jne ftrace_stub | ||
218 | |||
219 | MCOUNT_SAVE_FRAME | 216 | MCOUNT_SAVE_FRAME |
220 | 217 | ||
221 | leaq 8(%rbp), %rdi | 218 | leaq 8(%rbp), %rdi |