diff options
| author | Adrian Hunter <adrian.hunter@intel.com> | 2014-07-14 13:02:35 +0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2014-07-16 17:57:35 -0300 |
| commit | 4d40b051b1ac41ecbc818deed27750b4c1697520 (patch) | |
| tree | ed28545a3af1b938d6a162e45db256a04534fdc2 /tools/perf/util/callchain.c | |
| parent | e38b43c3f3fd8ebe6f558400d1647a923bc19d44 (diff) | |
perf callchain: Fix appending a callchain from a previous sample
hist_entry__append_callchain() must check if the sample has a callcahin
or it will append the callchain from a previous sample.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1405332185-4050-12-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/callchain.c')
| -rw-r--r-- | tools/perf/util/callchain.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c index 48b6d3f5001..437ee09727e 100644 --- a/tools/perf/util/callchain.c +++ b/tools/perf/util/callchain.c @@ -626,7 +626,7 @@ int sample__resolve_callchain(struct perf_sample *sample, struct symbol **parent int hist_entry__append_callchain(struct hist_entry *he, struct perf_sample *sample) { - if (!symbol_conf.use_callchain) + if (!symbol_conf.use_callchain || sample->callchain == NULL) return 0; return callchain_append(he->callchain, &callchain_cursor, sample->period); } |