diff options
| author | Mark Brown <broonie@kernel.org> | 2025-03-05 19:10:50 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2025-03-05 19:10:50 +0000 |
| commit | c6141ba0110f98266106699aca071fed025c3d64 (patch) | |
| tree | 5b2c335cbed607d85e2fa51c54e29a2e4b0eb24d /kernel/trace/trace_functions.c | |
| parent | a1462fb8b5dd1018e3477a6861822d75c6a59449 (diff) | |
| parent | 927e6bec5cf3624665b0a2e9f64a1d32f3d22cdd (diff) | |
| download | lwn-c6141ba0110f98266106699aca071fed025c3d64.tar.gz lwn-c6141ba0110f98266106699aca071fed025c3d64.zip | |
ASoC: Merge up fixes
Merge branch 'for-6.14' of
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into
asoc-6.15 to avoid a bunch of add/add conflicts.
Diffstat (limited to 'kernel/trace/trace_functions.c')
| -rw-r--r-- | kernel/trace/trace_functions.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c index d358c9935164..df56f9b76010 100644 --- a/kernel/trace/trace_functions.c +++ b/kernel/trace/trace_functions.c @@ -216,7 +216,7 @@ function_trace_call(unsigned long ip, unsigned long parent_ip, parent_ip = function_get_true_parent_ip(parent_ip, fregs); - trace_ctx = tracing_gen_ctx(); + trace_ctx = tracing_gen_ctx_dec(); data = this_cpu_ptr(tr->array_buffer.data); if (!atomic_read(&data->disabled)) @@ -321,7 +321,6 @@ function_no_repeats_trace_call(unsigned long ip, unsigned long parent_ip, struct trace_array *tr = op->private; struct trace_array_cpu *data; unsigned int trace_ctx; - unsigned long flags; int bit; if (unlikely(!tr->function_enabled)) @@ -347,8 +346,7 @@ function_no_repeats_trace_call(unsigned long ip, unsigned long parent_ip, if (is_repeat_check(tr, last_info, ip, parent_ip)) goto out; - local_save_flags(flags); - trace_ctx = tracing_gen_ctx_flags(flags); + trace_ctx = tracing_gen_ctx_dec(); process_repeats(tr, ip, parent_ip, last_info, trace_ctx); trace_function(tr, ip, parent_ip, trace_ctx); |