diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-05-11 16:56:38 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-05-11 16:56:38 +0200 |
commit | d2950158d0d7bc376503393ca5f73f6f8d27c56b (patch) | |
tree | 7daa04400d833bd722258a49d56a39acfb392520 /Documentation/sysctl/kernel.txt | |
parent | ea7c28518943b26a85d73cd76acd03b71962cb18 (diff) | |
parent | e9d848cb65d5f6f7731d12bd1b6d994bfdbcc94f (diff) | |
download | linux-d2950158d0d7bc376503393ca5f73f6f8d27c56b.tar.gz linux-d2950158d0d7bc376503393ca5f73f6f8d27c56b.tar.bz2 linux-d2950158d0d7bc376503393ca5f73f6f8d27c56b.zip |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/sysctl/kernel.txt')
-rw-r--r-- | Documentation/sysctl/kernel.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt index 260cde08e92e..daabdd7ee543 100644 --- a/Documentation/sysctl/kernel.txt +++ b/Documentation/sysctl/kernel.txt @@ -646,7 +646,7 @@ allowed to execute. perf_event_paranoid: Controls use of the performance events system by unprivileged -users (without CAP_SYS_ADMIN). The default value is 1. +users (without CAP_SYS_ADMIN). The default value is 2. -1: Allow use of (almost) all events by all users >=0: Disallow raw tracepoint access by users without CAP_IOC_LOCK |