aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/util/header.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-09-28 03:46:43 -0400
committerIngo Molnar <mingo@kernel.org>2012-09-28 03:46:43 -0400
commit1d787d37c8ff6612b8151c6dff15bfa7347bcbdf (patch)
treef33947a6603b406ba1e8b80114b2de313bcd9f09 /tools/perf/util/header.c
parentac2ba2b363a40a2431506d446985af4e4108b0d2 (diff)
parentaec1930b0f6f281a0ca038cd03aceace3fe0bb61 (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: * Improve listing of accessible enum perf probe variables, from Hyeoncheol Lee. * Don't stop the build if the audit libraries are not installed, fix 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/header.c')
-rw-r--r--tools/perf/util/header.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 6aae3290358e..7daad237dea5 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -1256,8 +1256,10 @@ read_event_desc(struct perf_header *ph, int fd)
1256 if (ret != (ssize_t)sizeof(nr)) 1256 if (ret != (ssize_t)sizeof(nr))
1257 goto error; 1257 goto error;
1258 1258
1259 if (ph->needs_swap) 1259 if (ph->needs_swap) {
1260 nr = bswap_32(nr); 1260 nr = bswap_32(nr);
1261 evsel->needs_swap = true;
1262 }
1261 1263
1262 evsel->name = do_read_string(fd, ph); 1264 evsel->name = do_read_string(fd, ph);
1263 1265
@@ -2626,6 +2628,8 @@ int perf_session__read_header(struct perf_session *session, int fd)
2626 2628
2627 if (evsel == NULL) 2629 if (evsel == NULL)
2628 goto out_delete_evlist; 2630 goto out_delete_evlist;
2631
2632 evsel->needs_swap = header->needs_swap;
2629 /* 2633 /*
2630 * Do it before so that if perf_evsel__alloc_id fails, this 2634 * Do it before so that if perf_evsel__alloc_id fails, this
2631 * entry gets purged too at perf_evlist__delete(). 2635 * entry gets purged too at perf_evlist__delete().