Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 167e33c3 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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

parents 86b47c25 6340cfed

tools/perf/builtin-stat.c

+2 −1
Original line number Diff line number Diff line
@@ -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));

tools/perf/util/header.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

		/*