diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-09-08 13:26:02 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-09-08 13:26:02 +0200 |
| commit | ef34eb4da3eb62a1511592adf7c76d74faca0b14 (patch) | |
| tree | 7f28887cf8c5d7059416769e152e79f68ce32830 /tools/perf/util/session.h | |
| parent | 479d875835a49e849683743ec50c30b6a429696b (diff) | |
| parent | b155a09015135cf59ada8d48109ccbd9891c1b42 (diff) | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
* Fix build for another rbtree.c change, from Adrian Hunter.
* Fixes for perf to build on Android, from Irina Tirdea.
* Make 'perf diff' command work with evsel hists, from Jiri Olsa.
* Use the only field_sep var that is set up: symbol_conf.field_sep,
fix from Jiri Olsa.
* .gitignore compiled python binaries, from Namhyung Kim.
* Get rid of die() in more libtraceevent places, from Namhyung Kim.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/session.h')
| -rw-r--r-- | tools/perf/util/session.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h index 176a60902f5..aab414fbb64 100644 --- a/tools/perf/util/session.h +++ b/tools/perf/util/session.h @@ -36,9 +36,7 @@ struct perf_session { struct pevent *pevent; /* * FIXME: Need to split this up further, we need global - * stats + per event stats. 'perf diff' also needs - * to properly support multiple events in a single - * perf.data file. + * stats + per event stats. */ struct hists hists; int fd; |