diff options
author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-06-25 12:42:38 -0400 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2014-07-18 13:58:10 -0400 |
commit | 6c56524101a3466263e20a63f851c866ea95c970 (patch) | |
tree | f86e062187a11d56d9a4917b8f8c4caba272494b /arch/blackfin/kernel | |
parent | ad515ea2882ee3af1a180d827bfdb5767e0a9455 (diff) |
Blackfin: ftrace: 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/3144266.ziutPk5CNZ@vapier
Acked-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'arch/blackfin/kernel')
-rw-r--r-- | arch/blackfin/kernel/ftrace-entry.S | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/blackfin/kernel/ftrace-entry.S b/arch/blackfin/kernel/ftrace-entry.S index 7eed00bbd26d..28d059540424 100644 --- a/arch/blackfin/kernel/ftrace-entry.S +++ b/arch/blackfin/kernel/ftrace-entry.S | |||
@@ -33,15 +33,6 @@ ENDPROC(__mcount) | |||
33 | * function will be waiting there. mmmm pie. | 33 | * function will be waiting there. mmmm pie. |
34 | */ | 34 | */ |
35 | ENTRY(_ftrace_caller) | 35 | ENTRY(_ftrace_caller) |
36 | # ifdef CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST | ||
37 | /* optional micro optimization: return if stopped */ | ||
38 | p1.l = _function_trace_stop; | ||
39 | p1.h = _function_trace_stop; | ||
40 | r3 = [p1]; | ||
41 | cc = r3 == 0; | ||
42 | if ! cc jump _ftrace_stub (bp); | ||
43 | # endif | ||
44 | |||
45 | /* save first/second/third function arg and the return register */ | 36 | /* save first/second/third function arg and the return register */ |
46 | [--sp] = r2; | 37 | [--sp] = r2; |
47 | [--sp] = r0; | 38 | [--sp] = r0; |
@@ -83,15 +74,6 @@ ENDPROC(_ftrace_caller) | |||
83 | 74 | ||
84 | /* See documentation for _ftrace_caller */ | 75 | /* See documentation for _ftrace_caller */ |
85 | ENTRY(__mcount) | 76 | ENTRY(__mcount) |
86 | # ifdef CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST | ||
87 | /* optional micro optimization: return if stopped */ | ||
88 | p1.l = _function_trace_stop; | ||
89 | p1.h = _function_trace_stop; | ||
90 | r3 = [p1]; | ||
91 | cc = r3 == 0; | ||
92 | if ! cc jump _ftrace_stub (bp); | ||
93 | # endif | ||
94 | |||
95 | /* save third function arg early so we can do testing below */ | 77 | /* save third function arg early so we can do testing below */ |
96 | [--sp] = r2; | 78 | [--sp] = r2; |
97 | 79 | ||