2014-04-17 19:43:07

by Fabian Frédérick

Subject: [PATCH 1/1] kernel/trace: add static to local functions

This patch adds static to the following functions:
-cycle_t buffer_ftrace_now
-void free_snapshot
-int trace_selftest_startup_dynamic_tracing

Cc: Steven Rostedt <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Signed-off-by: Fabian Frederick <[email protected]>
---
kernel/trace/trace.c | 4 ++--
kernel/trace/trace_selftest.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 737b0ef..6acaeb7 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -275,7 +275,7 @@ int call_filter_check_discard(struct ftrace_event_call *call, void *rec,
}
EXPORT_SYMBOL_GPL(call_filter_check_discard);

-cycle_t buffer_ftrace_now(struct trace_buffer *buf, int cpu)
+static cycle_t buffer_ftrace_now(struct trace_buffer *buf, int cpu)
{
u64 ts;

@@ -599,7 +599,7 @@ static int alloc_snapshot(struct trace_array *tr)
return 0;
}

-void free_snapshot(struct trace_array *tr)
+static void free_snapshot(struct trace_array *tr)
{
/*
* We don't free the ring buffer. instead, resize it because
diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c
index e98fca6..bfecd63 100644
--- a/kernel/trace/trace_selftest.c
+++ b/kernel/trace/trace_selftest.c
@@ -315,9 +315,9 @@ static int trace_selftest_ops(int cnt)
}

/* Test dynamic code modification and ftrace filters */
-int trace_selftest_startup_dynamic_tracing(struct tracer *trace,
- struct trace_array *tr,
- int (*func)(void))
+static int trace_selftest_startup_dynamic_tracing(struct tracer *trace,
+ struct trace_array *tr,
+ int (*func)(void))
{
int save_ftrace_enabled = ftrace_enabled;
unsigned long count;
--
1.8.4.5

2014-04-17 23:56:43

by Steven Rostedt

Subject: Re: [PATCH 1/1] kernel/trace: add static to local functions

On Thu, 17 Apr 2014 21:44:42 +0200
Fabian Frederick <[email protected]> wrote:

> This patch adds static to the following functions:
> -cycle_t buffer_ftrace_now
> -void free_snapshot
> -int trace_selftest_startup_dynamic_tracing
>
> Cc: Steven Rostedt <[email protected]>
> Cc: Frederic Weisbecker <[email protected]>
> Signed-off-by: Fabian Frederick <[email protected]>
> ---
> kernel/trace/trace.c | 4 ++--
> kernel/trace/trace_selftest.c | 6 +++---
> 2 files changed, 5 insertions(+), 5 deletions(-)
>

Thanks, I'll add this to my 3.16 queue.

-- Steve