diff options
author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-06-26 11:24:52 -0400 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2014-07-18 13:58:12 -0400 |
commit | 3a636388bae8390d23f31e061c0c6fdc14525786 (patch) | |
tree | 50cb0566552c3bccb4608cc2631cc2ffe7530587 | |
parent | 2a62a57a0633c7bbc9689d738ec0235e2ec822dc (diff) |
tracing: Remove function_trace_stop and HAVE_FUNCTION_TRACE_MCOUNT_TEST
All users of function_trace_stop and HAVE_FUNCTION_TRACE_MCOUNT_TEST have
been removed. We can safely remove them from the kernel.
Reviewed-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r-- | include/linux/ftrace.h | 2 | ||||
-rw-r--r-- | kernel/trace/Kconfig | 5 | ||||
-rw-r--r-- | kernel/trace/ftrace.c | 3 |
3 files changed, 0 insertions, 10 deletions
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index c800906235e1..7a5b7b97e539 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h | |||
@@ -129,8 +129,6 @@ struct ftrace_ops { | |||
129 | #endif | 129 | #endif |
130 | }; | 130 | }; |
131 | 131 | ||
132 | extern int function_trace_stop; | ||
133 | |||
134 | /* | 132 | /* |
135 | * Type of the current tracing. | 133 | * Type of the current tracing. |
136 | */ | 134 | */ |
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index d4409356f40d..a5da09c899dd 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig | |||
@@ -29,11 +29,6 @@ config HAVE_FUNCTION_GRAPH_FP_TEST | |||
29 | help | 29 | help |
30 | See Documentation/trace/ftrace-design.txt | 30 | See Documentation/trace/ftrace-design.txt |
31 | 31 | ||
32 | config HAVE_FUNCTION_TRACE_MCOUNT_TEST | ||
33 | bool | ||
34 | help | ||
35 | See Documentation/trace/ftrace-design.txt | ||
36 | |||
37 | config HAVE_DYNAMIC_FTRACE | 32 | config HAVE_DYNAMIC_FTRACE |
38 | bool | 33 | bool |
39 | help | 34 | help |
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 70abf97d6e84..4c61f28a08e0 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c | |||
@@ -80,9 +80,6 @@ static struct ftrace_ops ftrace_list_end __read_mostly = { | |||
80 | int ftrace_enabled __read_mostly; | 80 | int ftrace_enabled __read_mostly; |
81 | static int last_ftrace_enabled; | 81 | static int last_ftrace_enabled; |
82 | 82 | ||
83 | /* Quick disabling of function tracer. */ | ||
84 | int function_trace_stop __read_mostly; | ||
85 | |||
86 | /* Current function tracing op */ | 83 | /* Current function tracing op */ |
87 | struct ftrace_ops *function_trace_op __read_mostly = &ftrace_list_end; | 84 | struct ftrace_ops *function_trace_op __read_mostly = &ftrace_list_end; |
88 | /* What to set function_trace_op to */ | 85 | /* What to set function_trace_op to */ |