diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-08-09 10:53:39 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-08-09 10:53:39 -0400 |
| commit | 0e1c438c44dd9cde56effb44c5f1cfeda72e108d (patch) | |
| tree | fa3492d4d7d8b7444e5d8ebe6c78210826333e4b /tools/perf/builtin-annotate.c | |
| parent | c096397c78f766db972f923433031f2dec01cae0 (diff) | |
| parent | cdb2d3ee0436d74fa9092f2df46aaa6f9e03c969 (diff) | |
Merge tag 'kvmarm-fixes-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm fixes for 5.3
- A bunch of switch/case fall-through annotation, fixing one actual bug
- Fix PMU reset bug
- Add missing exception class debug strings
Diffstat (limited to 'tools/perf/builtin-annotate.c')
| -rw-r--r-- | tools/perf/builtin-annotate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index 77deb3a40596..e0aa14faf2b5 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c | |||
| @@ -8,11 +8,11 @@ | |||
| 8 | */ | 8 | */ |
| 9 | #include "builtin.h" | 9 | #include "builtin.h" |
| 10 | 10 | ||
| 11 | #include "util/util.h" | ||
| 12 | #include "util/color.h" | 11 | #include "util/color.h" |
| 13 | #include <linux/list.h> | 12 | #include <linux/list.h> |
| 14 | #include "util/cache.h" | 13 | #include "util/cache.h" |
| 15 | #include <linux/rbtree.h> | 14 | #include <linux/rbtree.h> |
| 15 | #include <linux/zalloc.h> | ||
| 16 | #include "util/symbol.h" | 16 | #include "util/symbol.h" |
| 17 | 17 | ||
| 18 | #include "perf.h" | 18 | #include "perf.h" |