Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[pandora-kernel.git] / tools / perf / util / session.h

diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h
index ce00fa6..55c6881 100644 (file)
--- a/tools/perf/util/session.h
+++ b/tools/perf/util/session.h
@@ -30,8 +30,6 @@ struct perf_session {
        struct machine          host_machine;
        struct rb_root          machines;
        struct rb_root          hists_tree;
-       unsigned long           event_total[PERF_RECORD_MAX];
-       unsigned long           unknown_events;
        /*
         * FIXME: should point to the first entry in hists_tree and
         *        be a hists instance. Right now its only 'report'
@@ -134,10 +132,12 @@ void perf_session__process_machines(struct perf_session *self,
 
 size_t perf_session__fprintf_dsos(struct perf_session *self, FILE *fp);
 
+size_t perf_session__fprintf_dsos_buildid(struct perf_session *self,
+                                         FILE *fp, bool with_hits);
+
 static inline
-size_t perf_session__fprintf_dsos_buildid(struct perf_session *self, FILE *fp,
-                                         bool with_hits)
+size_t perf_session__fprintf_nr_events(struct perf_session *self, FILE *fp)
 {
-       return machines__fprintf_dsos_buildid(&self->machines, fp, with_hits);
+       return hists__fprintf_nr_events(&self->hists, fp);
 }
 #endif /* __PERF_SESSION_H */