diff options
author | Namhyung Kim <namhyung@kernel.org> | 2025-02-05 14:57:18 -0800 |
---|---|---|
committer | Namhyung Kim <namhyung@kernel.org> | 2025-02-05 14:57:18 -0800 |
commit | 9e676a024fa1fa2bd8150c2d2ba85478280353bc (patch) | |
tree | 5cf0e1d4ab27002fcafdc7dc5bdfdd9ff3f3c9f1 /tools/perf/builtin-trace.c | |
parent | 357b965deba9fb71467413e473764ec4e1694d8d (diff) | |
parent | 2014c95afecee3e76ca4a56956a936e23283f05b (diff) |
Merge tag 'v6.14-rc1' into perf-tools-next
To get the various fixes in the current master.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Diffstat (limited to 'tools/perf/builtin-trace.c')
-rw-r--r-- | tools/perf/builtin-trace.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index ac97632f13dc..06356217adeb 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -2107,8 +2107,12 @@ static int trace__read_syscall_info(struct trace *trace, int id) return PTR_ERR(sc->tp_format); } + /* + * The tracepoint format contains __syscall_nr field, so it's one more + * than the actual number of syscall arguments. + */ if (syscall__alloc_arg_fmts(sc, IS_ERR(sc->tp_format) ? - RAW_SYSCALL_ARGS_NUM : sc->tp_format->format.nr_fields)) + RAW_SYSCALL_ARGS_NUM : sc->tp_format->format.nr_fields - 1)) return -ENOMEM; sc->args = sc->tp_format->format.fields; |