diff options
Diffstat (limited to 'kernel/perf_counter.c')
-rw-r--r-- | kernel/perf_counter.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c index 76376ecb23b5..7efb7ebaaae0 100644 --- a/kernel/perf_counter.c +++ b/kernel/perf_counter.c | |||
@@ -42,6 +42,8 @@ static atomic_t nr_mmap_tracking __read_mostly; | |||
42 | static atomic_t nr_munmap_tracking __read_mostly; | 42 | static atomic_t nr_munmap_tracking __read_mostly; |
43 | static atomic_t nr_comm_tracking __read_mostly; | 43 | static atomic_t nr_comm_tracking __read_mostly; |
44 | 44 | ||
45 | int sysctl_perf_counter_priv __read_mostly; /* do we need to be privileged */ | ||
46 | |||
45 | /* | 47 | /* |
46 | * Mutex for (sysadmin-configurable) counter reservations: | 48 | * Mutex for (sysadmin-configurable) counter reservations: |
47 | */ | 49 | */ |
@@ -1132,7 +1134,7 @@ static struct perf_counter_context *find_get_context(pid_t pid, int cpu) | |||
1132 | */ | 1134 | */ |
1133 | if (cpu != -1) { | 1135 | if (cpu != -1) { |
1134 | /* Must be root to operate on a CPU counter: */ | 1136 | /* Must be root to operate on a CPU counter: */ |
1135 | if (!capable(CAP_SYS_ADMIN)) | 1137 | if (sysctl_perf_counter_priv && !capable(CAP_SYS_ADMIN)) |
1136 | return ERR_PTR(-EACCES); | 1138 | return ERR_PTR(-EACCES); |
1137 | 1139 | ||
1138 | if (cpu < 0 || cpu > num_possible_cpus()) | 1140 | if (cpu < 0 || cpu > num_possible_cpus()) |