diff options
| author | David S. Miller <davem@davemloft.net> | 2011-10-07 13:38:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-10-07 13:38:43 -0400 |
| commit | 88c5100c28b02c4b2b2c6f6fafbbd76d90f698b9 (patch) | |
| tree | 08c4399e0341f7eb0ccb24e15f2cab687275c2a4 /tools/perf/util/session.h | |
| parent | 8083f0fc969d9b5353061a7a6f963405057e26b1 (diff) | |
| parent | 3ee72ca99288f1de95ec9c570e43f531c8799f06 (diff) | |
Merge branch 'master' of github.com:davem330/net
Conflicts:
net/batman-adv/soft-interface.c
Diffstat (limited to 'tools/perf/util/session.h')
| -rw-r--r-- | tools/perf/util/session.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h index 170601e67d6b..974d0cbee5e9 100644 --- a/tools/perf/util/session.h +++ b/tools/perf/util/session.h | |||
| @@ -162,7 +162,8 @@ static inline int perf_session__parse_sample(struct perf_session *session, | |||
| 162 | { | 162 | { |
| 163 | return perf_event__parse_sample(event, session->sample_type, | 163 | return perf_event__parse_sample(event, session->sample_type, |
| 164 | session->sample_size, | 164 | session->sample_size, |
| 165 | session->sample_id_all, sample); | 165 | session->sample_id_all, sample, |
| 166 | session->header.needs_swap); | ||
| 166 | } | 167 | } |
| 167 | 168 | ||
| 168 | struct perf_evsel *perf_session__find_first_evtype(struct perf_session *session, | 169 | struct perf_evsel *perf_session__find_first_evtype(struct perf_session *session, |