diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-11 14:29:34 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-11 14:29:34 -0500 |
| commit | 26a9ba160f50115ece48198608002600914932a7 (patch) | |
| tree | bcbc9be816e0282c0e33822b897489ca74a3e54f /tools/perf/builtin-top.c | |
| parent | 13b5892672073b1169b3b60b8a57123fb32c9df1 (diff) | |
| parent | c10edee2e1716f8cf217cf52ed01ae4742fcdf3c (diff) | |
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf tools: Fix permission checks
perf_events: Fix some typo in the perf events config description
Diffstat (limited to 'tools/perf/builtin-top.c')
| -rw-r--r-- | tools/perf/builtin-top.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |