projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e3d5911
)
perf header: Set header version correctly
author
Namhyung Kim
<
[email protected]
>
Thu, 29 Jan 2015 08:06:45 +0000
(17:06 +0900)
committer
Arnaldo Carvalho de Melo
<
[email protected]
>
Thu, 29 Jan 2015 19:53:11 +0000
(16:53 -0300)
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 <
[email protected]
>
Cc: Adrian Hunter <
[email protected]
>
Cc: Andi Kleen <
[email protected]
>
Cc: David Ahern <
[email protected]
>
Cc: Frederic Weisbecker <
[email protected]
>
Cc: Jiri Olsa <
[email protected]
>
Cc: Peter Zijlstra <
[email protected]
>
Cc: Stephane Eranian <
[email protected]
>
Link:
http://lkml.kernel.org/r/
[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <
[email protected]
>
tools/perf/util/header.c
patch
|
blob
|
history
diff --git
a/tools/perf/util/header.c
b/tools/perf/util/header.c
index b20e40c74468d13f951c8e3415e7bd8db225ee53..1f407f7352a7fd2bab67ad13e63e5fcd053495ba 100644
(file)
--- 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,
* - unique number to identify actual perf.data files
* - encode endianness of file
*/
+ ph->version = PERF_HEADER_VERSION_2;
/* check magic number with one endianness */
if (magic == __perf_magic2)
@@
-2247,7
+2248,6
@@
static int check_magic_endian(u64 magic, uint64_t hdr_sz,
return -1;
ph->needs_swap = true;
- ph->version = PERF_HEADER_VERSION_2;
return 0;
}