diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-10-08 11:13:17 -0300 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-10-08 11:13:17 -0300 |
commit | 47e7dd34a26def31af352df3a8281e7ff1bc345a (patch) | |
tree | f8cbd86ce126d65f79bca2ceefbaea6130923e1b /tools/perf/pmu-events/jevents.c | |
parent | be8ecc57f180415e8a7c1cc5620c5236be2a7e56 (diff) | |
parent | 1da38549dd64c7f5dd22427f12dfa8db3d8a722b (diff) | |
download | linux-47e7dd34a26def31af352df3a8281e7ff1bc345a.tar.bz2 |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up the fixes in perf/urgent that were just merged into upstream.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/pmu-events/jevents.c')
-rw-r--r-- | tools/perf/pmu-events/jevents.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c index 19497e4f8a86..b7c8aae6bcf1 100644 --- a/tools/perf/pmu-events/jevents.c +++ b/tools/perf/pmu-events/jevents.c @@ -1297,6 +1297,7 @@ int main(int argc, char *argv[]) } free_arch_std_events(); + free_sys_event_tables(); free(mapfile); return 0; @@ -1318,6 +1319,7 @@ err_close_eventsfp: create_empty_mapping(output_file); err_out: free_arch_std_events(); + free_sys_event_tables(); free(mapfile); return ret; } |