diff options
author | Namhyung Kim <namhyung@kernel.org> | 2015-01-29 03:06:45 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-01-29 14:53:11 -0500 |
commit | f7913971bdad1a72c6158074786babed477d61e2 (patch) | |
tree | c4fb69d33364fcfeb3983e8a5cc0df656b298d6a /tools | |
parent | e3d5911221f5cf71e1f0306256d4e42d34a365d2 (diff) |
perf header: Set header version correctly
When check_magic_endian() is called, it checks the magic number in the
perf data file to determine version and endianness. But if it uses a
same endian the verison number wasn't updated and makes confusion.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1422518843-25818-5-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/util/header.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index b20e40c74468..1f407f7352a7 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c | |||
@@ -2237,6 +2237,7 @@ static int check_magic_endian(u64 magic, uint64_t hdr_sz, | |||
2237 | * - unique number to identify actual perf.data files | 2237 | * - unique number to identify actual perf.data files |
2238 | * - encode endianness of file | 2238 | * - encode endianness of file |
2239 | */ | 2239 | */ |
2240 | ph->version = PERF_HEADER_VERSION_2; | ||
2240 | 2241 | ||
2241 | /* check magic number with one endianness */ | 2242 | /* check magic number with one endianness */ |
2242 | if (magic == __perf_magic2) | 2243 | if (magic == __perf_magic2) |
@@ -2247,7 +2248,6 @@ static int check_magic_endian(u64 magic, uint64_t hdr_sz, | |||
2247 | return -1; | 2248 | return -1; |
2248 | 2249 | ||
2249 | ph->needs_swap = true; | 2250 | ph->needs_swap = true; |
2250 | ph->version = PERF_HEADER_VERSION_2; | ||
2251 | 2251 | ||
2252 | return 0; | 2252 | return 0; |
2253 | } | 2253 | } |