aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/builtin-report.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2011-11-11 20:10:26 -0500
committerArnaldo Carvalho de Melo <acme@redhat.com>2011-11-28 07:37:58 -0500
commit246d4ce8107ea16521384c8b2a8fcff354ef2b7c (patch)
tree07fbf7ad718cb25b8520d5ad28254c681459ca84 /tools/perf/builtin-report.c
parent10d0f086df77f3ff259b46cb501362dbaf2c7989 (diff)
perf session: Remove superfluous callchain_cursor member
Since we have it in evsel->hists.callchain_cursor, remove it from perf_session. One more step in disentangling several places from requiring a perf_session pointer. Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/n/tip-rxr5dj3di7ckyfmnz0naku1z@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/builtin-report.c')
-rw-r--r--tools/perf/builtin-report.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 758a287fc07a..b7ab373b9acc 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -65,7 +65,7 @@ static int perf_session__add_hist_entry(struct perf_session *session,
65 struct hist_entry *he; 65 struct hist_entry *he;
66 66
67 if ((sort__has_parent || symbol_conf.use_callchain) && sample->callchain) { 67 if ((sort__has_parent || symbol_conf.use_callchain) && sample->callchain) {
68 err = perf_session__resolve_callchain(session, al->thread, 68 err = perf_session__resolve_callchain(session, evsel, al->thread,
69 sample->callchain, &parent); 69 sample->callchain, &parent);
70 if (err) 70 if (err)
71 return err; 71 return err;
@@ -76,7 +76,8 @@ static int perf_session__add_hist_entry(struct perf_session *session,
76 return -ENOMEM; 76 return -ENOMEM;
77 77
78 if (symbol_conf.use_callchain) { 78 if (symbol_conf.use_callchain) {
79 err = callchain_append(he->callchain, &session->callchain_cursor, 79 err = callchain_append(he->callchain,
80 &evsel->hists.callchain_cursor,
80 sample->period); 81 sample->period);
81 if (err) 82 if (err)
82 return err; 83 return err;