diff options
| author | Maxime Ripard <maxime.ripard@bootlin.com> | 2019-04-08 10:27:17 +0200 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@bootlin.com> | 2019-04-08 10:27:17 +0200 |
| commit | b85d00bfef2a62180d9ae74ecc95befe37686836 (patch) | |
| tree | 8d4347eac61358e8c7f6e1f40ad5677e5321eb97 /tools/perf/perf.h | |
| parent | cd9063757a227cf31ebf5391ccda2bf583b0806e (diff) | |
| parent | 9b39b013037fbfa8d4b999345d9e904d8a336fc2 (diff) | |
Merge drm/drm-fixes into drm-misc-fixes
We haven't backmerged for a while and this creates some coherency issues
across DRM drivers.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Diffstat (limited to 'tools/perf/perf.h')
| -rw-r--r-- | tools/perf/perf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/perf.h b/tools/perf/perf.h index b120e547ddc7..c59743def8d3 100644 --- a/tools/perf/perf.h +++ b/tools/perf/perf.h @@ -66,7 +66,7 @@ struct record_opts { bool ignore_missing_thread; bool strict_freq; bool sample_id; - bool bpf_event; + bool no_bpf_event; unsigned int freq; unsigned int mmap_pages; unsigned int auxtrace_mmap_pages; |