diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-12-07 23:23:44 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-12-07 23:23:44 +0100 |
| commit | 167e33c32845a30368463dac5a4fe2be5edcc34a (patch) | |
| tree | 761029012ce71a6a3e90226cb676f05367292d0e | |
| parent | 86b47c25494b824da655b95f6fdb4fdb3f17aa77 (diff) | |
| parent | 6340cfed48c478cf67451ddcd2daa3438e642632 (diff) | |
| download | linux-167e33c32845a30368463dac5a4fe2be5edcc34a.tar.bz2 | |
Merge branch 'perf/urgent' of git://github.com/acmel/linux into perf/urgent
| -rw-r--r-- | tools/perf/builtin-stat.c | 3 | ||||
| -rw-r--r-- | tools/perf/util/header.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 7d98676808d8..955930e0a5c3 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -463,7 +463,8 @@ static int run_perf_stat(int argc __used, const char **argv) list_for_each_entry(counter, &evsel_list->entries, node) { if (create_perf_stat_counter(counter, first) < 0) { - if (errno == EINVAL || errno == ENOSYS || errno == ENOENT) { + if (errno == EINVAL || errno == ENOSYS || + errno == ENOENT || errno == EOPNOTSUPP) { if (verbose) ui__warning("%s event is not supported by the kernel.\n", event_name(counter)); diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index bcd05d05b4f0..33c17a2b2a81 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; /* |