diff options
| author | Namhyung Kim <namhyung@kernel.org> | 2025-06-22 21:54:03 -0700 |
|---|---|---|
| committer | Namhyung Kim <namhyung@kernel.org> | 2025-06-22 21:54:03 -0700 |
| commit | c833e8cc4dca7e3c0a9d0b9047a1b4822b229262 (patch) | |
| tree | 7cfd4ca423884505425e7f473b280ba392fb6b7c /kernel/trace/trace_functions_graph.c | |
| parent | edf2cadf01e8f2620af25b337d15ebc584911b46 (diff) | |
| parent | 86731a2a651e58953fc949573895f2fa6d456841 (diff) | |
Merge tag 'v6.16-rc3' into perf-tools-next
To get the fixes in libbpf and perf tools.
Signed-off-by: Namhyung Kim <namhyung@kernel.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 |