diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-09 08:07:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-09 08:07:24 -0800 |
| commit | 975e32c287a9b144cf115d3f42ca18664b3331df (patch) | |
| tree | c45cb3cd1bcaf2d09efeeaec192d344c898f2c70 /tools | |
| parent | 031af165b1cd295ef04d2bfbcae9bc3cb9180735 (diff) | |
| parent | 167e33c32845a30368463dac5a4fe2be5edcc34a (diff) | |
| download | linux-stable-975e32c287a9b144cf115d3f42ca18664b3331df.tar.gz linux-stable-975e32c287a9b144cf115d3f42ca18664b3331df.tar.bz2 linux-stable-975e32c287a9b144cf115d3f42ca18664b3331df.zip | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf: Do no try to schedule task events if there are none
lockdep, kmemcheck: Annotate ->lock in lockdep_init_map()
perf header: Use event_name() to get an event name
perf stat: Failure with "Operation not supported"
Diffstat (limited to 'tools')
| -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; /* |