diff options
-rw-r--r-- | init/Kconfig | 4 | ||||
-rw-r--r-- | tools/perf/builtin-record.c | 2 | ||||
-rw-r--r-- | tools/perf/builtin-top.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/init/Kconfig b/init/Kconfig index f51586406d62..9e03ef8b311e 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -937,7 +937,7 @@ config PERF_EVENTS | |||
937 | Enable kernel support for various performance events provided | 937 | Enable kernel support for various performance events provided |
938 | by software and hardware. | 938 | by software and hardware. |
939 | 939 | ||
940 | Software events are supported either build-in or via the | 940 | Software events are supported either built-in or via the |
941 | use of generic tracepoints. | 941 | use of generic tracepoints. |
942 | 942 | ||
943 | Most modern CPUs support performance events via performance | 943 | Most modern CPUs support performance events via performance |
@@ -949,7 +949,7 @@ config PERF_EVENTS | |||
949 | used to profile the code that runs on that CPU. | 949 | used to profile the code that runs on that CPU. |
950 | 950 | ||
951 | The Linux Performance Event subsystem provides an abstraction of | 951 | The Linux Performance Event subsystem provides an abstraction of |
952 | these software and hardware cevent apabilities, available via a | 952 | these software and hardware event capabilities, available via a |
953 | system call and used by the "perf" utility in tools/perf/. It | 953 | system call and used by the "perf" utility in tools/perf/. It |
954 | provides per task and per CPU counters, and it provides event | 954 | provides per task and per CPU counters, and it provides event |
955 | capabilities on top of those. | 955 | capabilities on top of those. |
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 3eeef339c787..a4be453fc8a9 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c | |||
@@ -426,7 +426,7 @@ try_again: | |||
426 | if (fd[nr_cpu][counter] < 0) { | 426 | if (fd[nr_cpu][counter] < 0) { |
427 | int err = errno; | 427 | int err = errno; |
428 | 428 | ||
429 | if (err == EPERM) | 429 | if (err == EPERM || err == EACCES) |
430 | die("Permission error - are you root?\n"); | 430 | die("Permission error - are you root?\n"); |
431 | else if (err == ENODEV && profile_cpu != -1) | 431 | else if (err == ENODEV && profile_cpu != -1) |
432 | die("No such device - did you specify an out-of-range profile CPU?\n"); | 432 | die("No such device - did you specify an out-of-range profile CPU?\n"); |
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index a1b1d10912dc..e23bc74e734f 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c | |||
@@ -1027,7 +1027,7 @@ try_again: | |||
1027 | if (fd[i][counter] < 0) { | 1027 | if (fd[i][counter] < 0) { |
1028 | int err = errno; | 1028 | int err = errno; |
1029 | 1029 | ||
1030 | if (err == EPERM) | 1030 | if (err == EPERM || err == EACCES) |
1031 | die("No permission - are you root?\n"); | 1031 | die("No permission - are you root?\n"); |
1032 | /* | 1032 | /* |
1033 | * If it's cycles then fall back to hrtimer | 1033 | * If it's cycles then fall back to hrtimer |