diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-05-22 10:07:37 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-05-22 10:10:01 +0200 |
commit | 3ac1bbcf13c56a19927df670f429eb0c3c11f8e5 (patch) | |
tree | 693e2b7f1a9cb0c6ed6d44375e370e1ae08c7ac9 /tools/perf/util/session.h | |
parent | a2d063ac216c1618bfc2b4d40b7176adffa63511 (diff) | |
parent | 5538becaec9ca2ff21e7826372941dc46f498487 (diff) | |
download | kernel_samsung_smdk4412-3ac1bbcf13c56a19927df670f429eb0c3c11f8e5.zip kernel_samsung_smdk4412-3ac1bbcf13c56a19927df670f429eb0c3c11f8e5.tar.gz kernel_samsung_smdk4412-3ac1bbcf13c56a19927df670f429eb0c3c11f8e5.tar.bz2 |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/urgent
Conflicts:
tools/perf/builtin-top.c
Semantic conflict:
util/include/linux/list.h # fix prefetch.h removal fallout
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/util/session.h')
-rw-r--r-- | tools/perf/util/session.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h index 8daaa2d..66d4e14 100644 --- a/tools/perf/util/session.h +++ b/tools/perf/util/session.h @@ -43,6 +43,7 @@ struct perf_session { */ struct hists hists; u64 sample_type; + int sample_size; int fd; bool fd_pipe; bool repipe; @@ -159,6 +160,7 @@ static inline int perf_session__parse_sample(struct perf_session *session, struct perf_sample *sample) { return perf_event__parse_sample(event, session->sample_type, + session->sample_size, session->sample_id_all, sample); } |