diff options
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r-- | kernel/trace/trace.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 414d7210b2ec..bcd93031d042 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
@@ -893,7 +893,7 @@ int __trace_bputs(unsigned long ip, const char *str) | |||
893 | EXPORT_SYMBOL_GPL(__trace_bputs); | 893 | EXPORT_SYMBOL_GPL(__trace_bputs); |
894 | 894 | ||
895 | #ifdef CONFIG_TRACER_SNAPSHOT | 895 | #ifdef CONFIG_TRACER_SNAPSHOT |
896 | static void tracing_snapshot_instance(struct trace_array *tr) | 896 | void tracing_snapshot_instance(struct trace_array *tr) |
897 | { | 897 | { |
898 | struct tracer *tracer = tr->current_trace; | 898 | struct tracer *tracer = tr->current_trace; |
899 | unsigned long flags; | 899 | unsigned long flags; |
@@ -949,7 +949,7 @@ static int resize_buffer_duplicate_size(struct trace_buffer *trace_buf, | |||
949 | struct trace_buffer *size_buf, int cpu_id); | 949 | struct trace_buffer *size_buf, int cpu_id); |
950 | static void set_buffer_entries(struct trace_buffer *buf, unsigned long val); | 950 | static void set_buffer_entries(struct trace_buffer *buf, unsigned long val); |
951 | 951 | ||
952 | static int alloc_snapshot(struct trace_array *tr) | 952 | int tracing_alloc_snapshot_instance(struct trace_array *tr) |
953 | { | 953 | { |
954 | int ret; | 954 | int ret; |
955 | 955 | ||
@@ -995,7 +995,7 @@ int tracing_alloc_snapshot(void) | |||
995 | struct trace_array *tr = &global_trace; | 995 | struct trace_array *tr = &global_trace; |
996 | int ret; | 996 | int ret; |
997 | 997 | ||
998 | ret = alloc_snapshot(tr); | 998 | ret = tracing_alloc_snapshot_instance(tr); |
999 | WARN_ON(ret < 0); | 999 | WARN_ON(ret < 0); |
1000 | 1000 | ||
1001 | return ret; | 1001 | return ret; |
@@ -5408,7 +5408,7 @@ static int tracing_set_tracer(struct trace_array *tr, const char *buf) | |||
5408 | 5408 | ||
5409 | #ifdef CONFIG_TRACER_MAX_TRACE | 5409 | #ifdef CONFIG_TRACER_MAX_TRACE |
5410 | if (t->use_max_tr && !had_max_tr) { | 5410 | if (t->use_max_tr && !had_max_tr) { |
5411 | ret = alloc_snapshot(tr); | 5411 | ret = tracing_alloc_snapshot_instance(tr); |
5412 | if (ret < 0) | 5412 | if (ret < 0) |
5413 | goto out; | 5413 | goto out; |
5414 | } | 5414 | } |
@@ -6451,7 +6451,7 @@ tracing_snapshot_write(struct file *filp, const char __user *ubuf, size_t cnt, | |||
6451 | } | 6451 | } |
6452 | #endif | 6452 | #endif |
6453 | if (!tr->allocated_snapshot) { | 6453 | if (!tr->allocated_snapshot) { |
6454 | ret = alloc_snapshot(tr); | 6454 | ret = tracing_alloc_snapshot_instance(tr); |
6455 | if (ret < 0) | 6455 | if (ret < 0) |
6456 | break; | 6456 | break; |
6457 | } | 6457 | } |
@@ -7179,7 +7179,7 @@ ftrace_trace_snapshot_callback(struct trace_array *tr, struct ftrace_hash *hash, | |||
7179 | return ret; | 7179 | return ret; |
7180 | 7180 | ||
7181 | out_reg: | 7181 | out_reg: |
7182 | ret = alloc_snapshot(tr); | 7182 | ret = tracing_alloc_snapshot_instance(tr); |
7183 | if (ret < 0) | 7183 | if (ret < 0) |
7184 | goto out; | 7184 | goto out; |
7185 | 7185 | ||