GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-20 05:31:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'perf/urgent' of git://github.com/acmel/linux into perf/urgent

Browse source
This commit is contained in:
Ingo Molnar 2011-12-07 23:23:44 +01:00
commit 167e33c328
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tools/perf/builtin-stat.c
View file

@ -463,7 +463,8 @@ static int run_perf_stat(int argc __used, const char **argv)
list_for_each_entry(counter, &evsel_list->entries, node) { list_for_each_entry(counter, &evsel_list->entries, node) {
if (create_perf_stat_counter(counter, first) < 0) { 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) if (verbose)
ui__warning("%s event is not supported by the kernel.\n", ui__warning("%s event is not supported by the kernel.\n",
event_name(counter)); event_name(counter));

2
tools/perf/util/header.c
View file

@ -388,7 +388,7 @@ static int write_event_desc(int fd, struct perf_header *h __used,
/* /*
* write event string as passed on cmdline * 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) if (ret < 0)
return ret; return ret;
/* /*