Merge commit 'v2.6.32-rc7' into perf/core

Merge reason: pick up perf fixlets

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2 files changed, 2 insertions, 2 deletions

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 326e8a79cabf..04f335ef9a8c 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -281,7 +281,7 @@ try_again:
         if (fd[nr_cpu][counter] < 0) {
                 int err = errno;
 
-                if (err == EPERM)
+                if (err == EPERM || err == EACCES)
                         die("Permission error - are you root?\n");
                 else if (err ==  ENODEV && profile_cpu != -1)
                         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 2aea913f7eb7..6613f988a33e 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -1031,7 +1031,7 @@ try_again:
         if (fd[i][counter] < 0) {
                 int err = errno;
 
-                if (err == EPERM)
+                if (err == EPERM || err == EACCES)
                         die("No permission - are you root?\n");
                 /*
                  * If it's cycles then fall back to hrtimer