diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-12-18 09:40:13 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-12-18 09:40:13 +0100 |
| commit | 2d2e7ac14a1f98922e100054bf62715439440f1a (patch) | |
| tree | ce93d0a9929f77f1703d0e80f9702058f4cd8ae4 | |
| parent | 03fba21adb190fc0aec9c2556639c1c1b195aee7 (diff) | |
| parent | fb202539e61b14bc63ac29af10fe5d758ecd880a (diff) | |
| download | op-kernel-dev-2d2e7ac14a1f98922e100054bf62715439440f1a.zip op-kernel-dev-2d2e7ac14a1f98922e100054bf62715439440f1a.tar.gz | |
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent tooling fix from Arnaldo Carvalho de Melo:
User visible changes:
- Fix 'perf list' segfault due to lack of support for PERF_CONF_SW_BPF_OUTPUT
in an array used just for printing available events, robustify the code
involved (Arnaldo Carvalho de Melo)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
| -rw-r--r-- | tools/perf/util/parse-events.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index e48d9da..6fc8cd7 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -124,6 +124,10 @@ struct event_symbol event_symbols_sw[PERF_COUNT_SW_MAX] = { .symbol = "dummy", .alias = "", }, + [PERF_COUNT_SW_BPF_OUTPUT] = { + .symbol = "bpf-output", + .alias = "", + }, }; #define __PERF_EVENT_FIELD(config, name) \ @@ -1879,7 +1883,7 @@ restart: for (i = 0; i < max; i++, syms++) { - if (event_glob != NULL && + if (event_glob != NULL && syms->symbol != NULL && !(strglobmatch(syms->symbol, event_glob) || (syms->alias && strglobmatch(syms->alias, event_glob)))) continue; |
