diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-12-22 19:21:47 -0500 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-12-22 19:21:47 -0500 |
| commit | f80ca163d65903276bec7045a484a79c0897eb2d (patch) | |
| tree | 97c7d61d43248b9db0757a76af80ff58b98b5599 /tools/perf | |
| parent | 0794ec8ce327ec74416b569b8fb1951274693700 (diff) | |
| parent | a6d52d70677e99bdb89b6921c265d0a58c22e597 (diff) | |
Merge branch 'ioat' into fixes
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/builtin-record.c | 2 | ||||
| -rw-r--r-- | tools/perf/builtin-top.c | 2 |
2 files changed, 2 insertions, 2 deletions
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 |