diff options
| author | akpm <akpm@linux-foundation.org> | 2022-06-27 10:31:44 -0700 |
|---|---|---|
| committer | akpm <akpm@linux-foundation.org> | 2022-06-27 10:31:44 -0700 |
| commit | ee56c3e8eec166f4e4a2ca842b7804d14f3a0208 (patch) | |
| tree | 3bcee4a6090d681b7bbb49d1946c95798f166159 /kernel/trace/trace.c | |
| parent | 00c9d5632277b21ba8802e26c27254cd9d0dfa13 (diff) | |
| parent | 03c765b0e3b4cb5063276b086c76f7a612856a9a (diff) | |
| download | linux-next-ee56c3e8eec166f4e4a2ca842b7804d14f3a0208.tar.gz | |
Merge branch 'master' into mm-nonmm-stable
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 2c95992e2c71..a8cfac0611bc 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -6424,9 +6424,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) |