summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2014-06-26 11:24:52 -0400
committerSteven Rostedt <rostedt@goodmis.org>2014-07-18 13:58:12 -0400
commit3a636388bae8390d23f31e061c0c6fdc14525786 (patch)
tree50cb0566552c3bccb4608cc2631cc2ffe7530587
parent2a62a57a0633c7bbc9689d738ec0235e2ec822dc (diff)
downloadop-kernel-dev-3a636388bae8390d23f31e061c0c6fdc14525786.zip
op-kernel-dev-3a636388bae8390d23f31e061c0c6fdc14525786.tar.gz
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.h2
-rw-r--r--kernel/trace/Kconfig5
-rw-r--r--kernel/trace/ftrace.c3
3 files changed, 0 insertions, 10 deletions
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index c800906..7a5b7b9 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -129,8 +129,6 @@ struct ftrace_ops {
#endif
};
-extern int function_trace_stop;
-
/*
* Type of the current tracing.
*/
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index d440935..a5da09c 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -29,11 +29,6 @@ config HAVE_FUNCTION_GRAPH_FP_TEST
help
See Documentation/trace/ftrace-design.txt
-config HAVE_FUNCTION_TRACE_MCOUNT_TEST
- bool
- help
- See Documentation/trace/ftrace-design.txt
-
config HAVE_DYNAMIC_FTRACE
bool
help
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 70abf97..4c61f28 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -80,9 +80,6 @@ static struct ftrace_ops ftrace_list_end __read_mostly = {
int ftrace_enabled __read_mostly;
static int last_ftrace_enabled;
-/* Quick disabling of function tracer. */
-int function_trace_stop __read_mostly;
-
/* Current function tracing op */
struct ftrace_ops *function_trace_op __read_mostly = &ftrace_list_end;
/* What to set function_trace_op to */
OpenPOWER on IntegriCloud