diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2026-01-26 17:03:53 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2026-01-26 17:03:53 -0300 |
| commit | d3b402c5a2d47f51eb0581da1a7b142f82cb10d1 (patch) | |
| tree | cf5b202147ca9d061067f87339450834aa25a7f0 /tools/perf | |
| parent | 3d06db9bad1ad8e67c3981964cfba224c07fc306 (diff) | |
| parent | fcb70a56f4d81450114034b2c61f48ce7444a0e2 (diff) | |
Merge remote-tracking branch 'torvalds/master' into perf-tools-next
Merge with upstream to pick up fixes from perf-tools and from other
tools/ parts that interact with tools/perf.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/builtin-list.c | 2 | ||||
| -rw-r--r-- | tools/perf/util/parse-events.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c index ac7bd0e41aa1..50f69c2c0d51 100644 --- a/tools/perf/builtin-list.c +++ b/tools/perf/builtin-list.c @@ -4,7 +4,7 @@ * * Builtin list command: list all event types * - * Copyright (C) 2009, Thomas Gleixner <tglx@linutronix.de> + * Copyright (C) 2009, Linutronix GmbH, Thomas Gleixner <tglx@kernel.org> * Copyright (C) 2008-2009, Red Hat Inc, Ingo Molnar <mingo@redhat.com> * Copyright (C) 2011, Red Hat Inc, Arnaldo Carvalho de Melo <acme@redhat.com> */ diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 6e1185d7be1b..d4647ded340f 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -251,8 +251,11 @@ __add_event(struct list_head *list, int *idx, event_attr_init(attr); evsel = evsel__new_idx(attr, *idx); - if (!evsel) - goto out_err; + if (!evsel) { + perf_cpu_map__put(cpus); + perf_cpu_map__put(pmu_cpus); + return NULL; + } if (name) { evsel->name = strdup(name); |