diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2011-01-11 13:58:54 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2011-01-11 14:31:26 -0500 |
commit | 4ad9f594d7199c99f6b1b3ef88c64bd5920a4592 (patch) | |
tree | 29786c4cc76908f6313f1d9fc55088fde9e61597 /tools | |
parent | cc841580aa58ad7498b23e282859d07f8b721e24 (diff) |
Revert "perf tools: Emit clearer message for sys_perf_event_open ENOENT return"
This reverts commit aa7bc7ef73efc46d7c3a0e185eefaf85744aec98.
It removed the fallback from hardware profiling to software profiling.
.e.g., in a VM with no PMU.
Reported-by: David Ahern <daahern@cisco.com>
Cc: David Ahern <daahern@cisco.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/builtin-record.c | 3 | ||||
-rw-r--r-- | tools/perf/builtin-top.c | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index aa7ece397656..1210e6484ad5 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c | |||
@@ -331,9 +331,6 @@ try_again: | |||
331 | else if (err == ENODEV && cpu_list) { | 331 | else if (err == ENODEV && cpu_list) { |
332 | die("No such device - did you specify" | 332 | die("No such device - did you specify" |
333 | " an out-of-range profile CPU?\n"); | 333 | " an out-of-range profile CPU?\n"); |
334 | } else if (err == ENOENT) { | ||
335 | die("%s event is not supported. ", | ||
336 | event_name(evsel)); | ||
337 | } else if (err == EINVAL && sample_id_all_avail) { | 334 | } else if (err == EINVAL && sample_id_all_avail) { |
338 | /* | 335 | /* |
339 | * Old kernel, no attr->sample_id_type_all field | 336 | * Old kernel, no attr->sample_id_type_all field |
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index 568b1950e632..05344c6210ac 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c | |||
@@ -1247,8 +1247,6 @@ try_again: | |||
1247 | die("Permission error - are you root?\n" | 1247 | die("Permission error - are you root?\n" |
1248 | "\t Consider tweaking" | 1248 | "\t Consider tweaking" |
1249 | " /proc/sys/kernel/perf_event_paranoid.\n"); | 1249 | " /proc/sys/kernel/perf_event_paranoid.\n"); |
1250 | if (err == ENOENT) | ||
1251 | die("%s event is not supported. ", event_name(evsel)); | ||
1252 | /* | 1250 | /* |
1253 | * If it's cycles then fall back to hrtimer | 1251 | * If it's cycles then fall back to hrtimer |
1254 | * based cpu-clock-tick sw counter, which | 1252 | * based cpu-clock-tick sw counter, which |