From a225cdd263f340c864febb1992802fb5b08bc328 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Thu, 15 Jan 2009 23:06:03 -0500
Subject: [PATCH] ftrace: remove static from function tracer functions
Impact: clean up
After reorganizing the functions in trace.c and trace_function.c,
they no longer need to be in global context. This patch makes the
functions and one variable into static.
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
kernel/trace/trace.c | 3 ---
kernel/trace/trace.h | 10 ----------
kernel/trace/trace_functions.c | 10 ++++++++--
3 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 2585ffb6c6b5..7de6a94063dd 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -187,9 +187,6 @@ int tracing_is_enabled(void)
return tracer_enabled;
}
-/* function tracing enabled */
-int ftrace_function_enabled;
-
/*
* trace_buf_size is the size in bytes that is allocated
* for a buffer. Note, the number of bytes is always rounded
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index bf39a369e4b3..54b72781e920 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -464,16 +464,6 @@ void __trace_stack(struct trace_array *tr,
extern cycle_t ftrace_now(int cpu);
-#ifdef CONFIG_FUNCTION_TRACER
-void tracing_start_function_trace(void);
-void tracing_stop_function_trace(void);
-#else
-# define tracing_start_function_trace() do { } while (0)
-# define tracing_stop_function_trace() do { } while (0)
-#endif
-
-extern int ftrace_function_enabled;
-
#ifdef CONFIG_CONTEXT_SWITCH_TRACER
typedef void
(*tracer_switch_func_t)(void *private,
diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c
index 61d0b73dabf5..b3a320f8aba7 100644
--- a/kernel/trace/trace_functions.c
+++ b/kernel/trace/trace_functions.c
@@ -16,8 +16,14 @@
#include "trace.h"
+/* function tracing enabled */
+static int ftrace_function_enabled;
+
static struct trace_array *func_trace;
+static void tracing_start_function_trace(void);
+static void tracing_stop_function_trace(void);
+
static void start_function_trace(struct trace_array *tr)
{
func_trace = tr;
@@ -177,7 +183,7 @@ static struct tracer_flags func_flags = {
.opts = func_opts
};
-void tracing_start_function_trace(void)
+static void tracing_start_function_trace(void)
{
ftrace_function_enabled = 0;
@@ -194,7 +200,7 @@ void tracing_start_function_trace(void)
ftrace_function_enabled = 1;
}
-void tracing_stop_function_trace(void)
+static void tracing_stop_function_trace(void)
{
ftrace_function_enabled = 0;
/* OK if they are not registered */
--
GitLab