diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-19 10:56:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-19 10:56:02 -0700 |
| commit | 96ad9999185363a1520434bdc6a775bbb27621f1 (patch) | |
| tree | 518ad695429dd159c075c413a5ff5fe00ee829c3 /tools/perf/util/ui/browsers/hists.c | |
| parent | 71460af58f8565110160283849db4d6bf7e1efa1 (diff) | |
| parent | 855357a21744e488cbee23a47d2b124035160a87 (diff) | |
| download | kernel_samsung_smdk4412-96ad9999185363a1520434bdc6a775bbb27621f1.zip kernel_samsung_smdk4412-96ad9999185363a1520434bdc6a775bbb27621f1.tar.gz kernel_samsung_smdk4412-96ad9999185363a1520434bdc6a775bbb27621f1.tar.bz2 | |
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf, x86: Fix AMD family 15h FPU event constraints
perf, x86: Fix pre-defined cache-misses event for AMD family 15h cpus
perf evsel: Fix use of inherit
perf hists browser: Fix seg fault when annotate null symbol
Diffstat (limited to 'tools/perf/util/ui/browsers/hists.c')
| -rw-r--r-- | tools/perf/util/ui/browsers/hists.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/ui/browsers/hists.c b/tools/perf/util/ui/browsers/hists.c index 798efdc..5d767c6 100644 --- a/tools/perf/util/ui/browsers/hists.c +++ b/tools/perf/util/ui/browsers/hists.c @@ -851,7 +851,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, goto out_free_stack; case 'a': if (browser->selection == NULL || - browser->selection->map == NULL || + browser->selection->sym == NULL || browser->selection->map->dso->annotate_warned) continue; goto do_annotate; |