diff options
| author | Mark Brown <broonie@kernel.org> | 2018-07-23 18:02:28 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-07-23 18:02:28 +0100 |
| commit | 0afdd676f6e575478634d961286094169adbc50d (patch) | |
| tree | dc04a98e56287b9375626457c6cdd56062e5f899 /tools/perf/builtin-annotate.c | |
| parent | e594a0636b0213d058aec2406e13f276b70791ed (diff) | |
| parent | eef5ba1aa148ca5e6deb1e0aa1de797fa4e12cb7 (diff) | |
Merge branch 'i2c/smbus_xfer_unlock-immutable' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux into regmap-4.19 for sccb dependency
Diffstat (limited to 'tools/perf/builtin-annotate.c')
| -rw-r--r-- | tools/perf/builtin-annotate.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index 5eb22cc56363..8180319285af 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c @@ -283,6 +283,15 @@ out_put: return ret; } +static int process_feature_event(struct perf_tool *tool, + union perf_event *event, + struct perf_session *session) +{ + if (event->feat.feat_id < HEADER_LAST_FEATURE) + return perf_event__process_feature(tool, event, session); + return 0; +} + static int hist_entry__tty_annotate(struct hist_entry *he, struct perf_evsel *evsel, struct perf_annotate *ann) @@ -471,7 +480,7 @@ int cmd_annotate(int argc, const char **argv) .attr = perf_event__process_attr, .build_id = perf_event__process_build_id, .tracing_data = perf_event__process_tracing_data, - .feature = perf_event__process_feature, + .feature = process_feature_event, .ordered_events = true, .ordering_requires_timestamps = true, }, |