[tip:perf/urgent] perf header: Use event_name() to get an event name

From: tip-bot for Andrew Vagin
Date: Wed Dec 07 2011 - 23:35:22 EST


Commit-ID: 6340cfed48c478cf67451ddcd2daa3438e642632
Gitweb: http://git.kernel.org/tip/6340cfed48c478cf67451ddcd2daa3438e642632
Author: Andrew Vagin <avagin@xxxxxxxxxx>
AuthorDate: Mon, 28 Nov 2011 12:03:29 +0300
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitDate: Tue, 6 Dec 2011 09:22:48 -0200

perf header: Use event_name() to get an event name

perf_evsel.name may be not initialized

Cc: David Ahern <dsahern@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Arun Sharma <asharma@xxxxxx>
Cc: devel@xxxxxxxxxx
Link: http://lkml.kernel.org/r/1322471015-107825-2-git-send-email-avagin@xxxxxxxxxx
Signed-off-by: Andrew Vagin <avagin@xxxxxxxxxx>
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
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 bcd05d0..33c17a2 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -388,7 +388,7 @@ static int write_event_desc(int fd, struct perf_header *h __used,
/*
* write event string as passed on cmdline
*/
- ret = do_write_string(fd, attr->name);
+ ret = do_write_string(fd, event_name(attr));
if (ret < 0)
return ret;
/*
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/