| From 86cfc8663c67806905c13b4e037a52d3e6cd7b64 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 2 Jun 2022 22:06:13 +0800 |
| Subject: tracing: Simplify conditional compilation code in |
| tracing_set_tracer() |
| |
| From: sunliming <sunliming@kylinos.cn> |
| |
| [ Upstream commit f4b0d318097e45cbac5e14976f8bb56aa2cef504 ] |
| |
| Two conditional compilation directives "#ifdef CONFIG_TRACER_MAX_TRACE" |
| are used consecutively, and no other code in between. Simplify conditional |
| the compilation code and only use one "#ifdef CONFIG_TRACER_MAX_TRACE". |
| |
| Link: https://lkml.kernel.org/r/20220602140613.545069-1-sunliming@kylinos.cn |
| |
| Signed-off-by: sunliming <sunliming@kylinos.cn> |
| Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org> |
| Stable-dep-of: a541a9559bb0 ("tracing: Do not free snapshot if tracer is on cmdline") |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| kernel/trace/trace.c | 2 -- |
| 1 file changed, 2 deletions(-) |
| |
| diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c |
| index 0dc17fd96102..21795777587b 100644 |
| --- a/kernel/trace/trace.c |
| +++ b/kernel/trace/trace.c |
| @@ -6416,9 +6416,7 @@ int tracing_set_tracer(struct trace_array *tr, const char *buf) |
| synchronize_rcu(); |
| free_snapshot(tr); |
| } |
| -#endif |
| |
| -#ifdef CONFIG_TRACER_MAX_TRACE |
| if (t->use_max_tr && !had_max_tr) { |
| ret = tracing_alloc_snapshot_instance(tr); |
| if (ret < 0) |
| -- |
| 2.35.1 |
| |
