diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-05-20 09:09:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-05-20 09:09:26 +0200 |
| commit | 06cd3d8c14bdd06f49f1c6a06acf219749c5598e (patch) | |
| tree | b9dd9ad824e489803072b9517dc01c0d75a4f918 /tools/perf/util/annotate.c | |
| parent | 0f6ff2bce0d4c3e4ff34f5d2ffb7329025b30844 (diff) | |
| parent | bc231d9ede99518b67a77544d9084f15b898fe2e (diff) | |
| download | lwn-06cd3d8c14bdd06f49f1c6a06acf219749c5598e.tar.gz lwn-06cd3d8c14bdd06f49f1c6a06acf219749c5598e.zip | |
Merge branch 'linus' into x86/urgent, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/annotate.c')
| -rw-r--r-- | tools/perf/util/annotate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index b795b6994144..4db73d5a0dbc 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -1138,7 +1138,7 @@ fallback: if (dso->symtab_type == DSO_BINARY_TYPE__KALLSYMS && !dso__is_kcore(dso)) { - char bf[BUILD_ID_SIZE * 2 + 16] = " with build id "; + char bf[SBUILD_ID_SIZE + 15] = " with build id "; char *build_id_msg = NULL; if (dso->annotate_warned) @@ -1665,5 +1665,5 @@ int hist_entry__annotate(struct hist_entry *he, size_t privsize) bool ui__has_annotation(void) { - return use_browser == 1 && sort__has_sym; + return use_browser == 1 && perf_hpp_list.sym; } |