diff options
| author | Namhyung Kim <namhyung@kernel.org> | 2024-11-03 23:16:30 -0800 |
|---|---|---|
| committer | Namhyung Kim <namhyung@kernel.org> | 2024-11-03 23:18:20 -0800 |
| commit | aa5c90601b531323f82ceb02b41a66974153b76f (patch) | |
| tree | 80ca2bed534b3b356bffa60eab11980c3f9a3400 /tools/perf/builtin-trace.c | |
| parent | d36e5b36a2928b30e09ff59ce5ce2d5df935176e (diff) | |
| parent | 59b723cd2adbac2a34fc8e12c74ae26ae45bf230 (diff) | |
Merge 'origin/master' into perf-tools-next
To get the fixes in the perf-tools branch. Resolved a conflict due to
RISC-V's syscall table change.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Diffstat (limited to 'tools/perf/builtin-trace.c')
| -rw-r--r-- | tools/perf/builtin-trace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index 748b061f8678..c1e9e14c8686 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -1399,7 +1399,7 @@ static const struct syscall_fmt syscall_fmts[] = { .arg = { [2] = { .scnprintf = SCA_WAITID_OPTIONS, /* options */ }, }, }, { .name = "waitid", .errpid = true, .arg = { [3] = { .scnprintf = SCA_WAITID_OPTIONS, /* options */ }, }, }, - { .name = "write", .errpid = true, + { .name = "write", .arg = { [1] = { .scnprintf = SCA_BUF /* buf */, .from_user = true, }, }, }, }; |