diff options
-rw-r--r-- | kernel/trace/trace.c | 4 | ||||
-rw-r--r-- | 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 bb5147a55be5..cb41e98cc64b 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, | |||
275 | } | 275 | } |
276 | EXPORT_SYMBOL_GPL(call_filter_check_discard); | 276 | EXPORT_SYMBOL_GPL(call_filter_check_discard); |
277 | 277 | ||
278 | cycle_t buffer_ftrace_now(struct trace_buffer *buf, int cpu) | 278 | static cycle_t buffer_ftrace_now(struct trace_buffer *buf, int cpu) |
279 | { | 279 | { |
280 | u64 ts; | 280 | u64 ts; |
281 | 281 | ||
@@ -599,7 +599,7 @@ static int alloc_snapshot(struct trace_array *tr) | |||
599 | return 0; | 599 | return 0; |
600 | } | 600 | } |
601 | 601 | ||
602 | void free_snapshot(struct trace_array *tr) | 602 | static void free_snapshot(struct trace_array *tr) |
603 | { | 603 | { |
604 | /* | 604 | /* |
605 | * We don't free the ring buffer. instead, resize it because | 605 | * 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 1c95cd7a98c8..5ef60499dc8e 100644 --- a/kernel/trace/trace_selftest.c +++ b/kernel/trace/trace_selftest.c | |||
@@ -320,9 +320,9 @@ static int trace_selftest_ops(struct trace_array *tr, int cnt) | |||
320 | } | 320 | } |
321 | 321 | ||
322 | /* Test dynamic code modification and ftrace filters */ | 322 | /* Test dynamic code modification and ftrace filters */ |
323 | int trace_selftest_startup_dynamic_tracing(struct tracer *trace, | 323 | static int trace_selftest_startup_dynamic_tracing(struct tracer *trace, |
324 | struct trace_array *tr, | 324 | struct trace_array *tr, |
325 | int (*func)(void)) | 325 | int (*func)(void)) |
326 | { | 326 | { |
327 | int save_ftrace_enabled = ftrace_enabled; | 327 | int save_ftrace_enabled = ftrace_enabled; |
328 | unsigned long count; | 328 | unsigned long count; |