diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-06-23 07:53:36 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-06-23 07:53:36 +0200 |
| commit | 63dafeb392139b893a73b6331f347613f0929702 (patch) | |
| tree | 44f928364b4e48c44b1ffe61d1578535de2a657a /kernel/trace/trace_functions_graph.c | |
| parent | b29929b819f35503024c6a7e6ad442f6e36c68a0 (diff) | |
| parent | 86731a2a651e58953fc949573895f2fa6d456841 (diff) | |
Merge 6.16-rc3 into driver-core-next
We need the driver-core fixes that are in 6.16-rc3 into here as well
to build on top of.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/trace/trace_functions_graph.c')
| -rw-r--r-- | kernel/trace/trace_functions_graph.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c index 9234e2c39abf..14d74a7491b8 100644 --- a/kernel/trace/trace_functions_graph.c +++ b/kernel/trace/trace_functions_graph.c @@ -455,10 +455,16 @@ static int graph_trace_init(struct trace_array *tr) return 0; } +static struct tracer graph_trace; + static int ftrace_graph_trace_args(struct trace_array *tr, int set) { trace_func_graph_ent_t entry; + /* Do nothing if the current tracer is not this tracer */ + if (tr->current_trace != &graph_trace) + return 0; + if (set) entry = trace_graph_entry_args; else |