mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge commit 'v2.6.32-rc7' into perf/core
Merge reason: pick up perf fixlets Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
commit
39dc78b651
382 changed files with 7011 additions and 3646 deletions
|
|
@ -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");
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue