diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2023-12-19 03:37:07 +0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2023-12-19 03:37:07 +0300 |
| commit | ab1c247094e323177a578b38f0325bf79f0317ac (patch) | |
| tree | 97ff10609587158d6f726f5d1b118b13339501d9 /tools/perf/builtin-list.c | |
| parent | 71225af17f611632226a4a2fae25235fd8dad268 (diff) | |
| parent | 2cf4f94d8e8646803f8fb0facf134b0cd7fb691a (diff) | |
| download | linux-ab1c247094e323177a578b38f0325bf79f0317ac.tar.xz | |
Merge remote-tracking branch 'torvalds/master' into perf-tools-next
To pick up fixes that went thru perf-tools for v6.7 and to get in sync
with upstream to check for drift in the copies of headers, etc.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/builtin-list.c')
| -rw-r--r-- | tools/perf/builtin-list.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c index a343823c8ddf..61c2c96cc070 100644 --- a/tools/perf/builtin-list.c +++ b/tools/perf/builtin-list.c @@ -434,6 +434,11 @@ static void json_print_metric(void *ps __maybe_unused, const char *group, strbuf_release(&buf); } +static bool json_skip_duplicate_pmus(void *ps __maybe_unused) +{ + return false; +} + static bool default_skip_duplicate_pmus(void *ps) { struct print_state *print_state = ps; @@ -503,6 +508,7 @@ int cmd_list(int argc, const char **argv) .print_end = json_print_end, .print_event = json_print_event, .print_metric = json_print_metric, + .skip_duplicate_pmus = json_skip_duplicate_pmus, }; ps = &json_ps; } else { |