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>

1 files changed, 2 insertions, 0 deletions

diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h
index 8daaa2d1539..66d4e149087 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);
 }