summaryrefslogtreecommitdiff
path: root/Documentation/sysctl
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-05-11 17:56:38 +0300
committerIngo Molnar <mingo@kernel.org>2016-05-11 17:56:38 +0300
commitd2950158d0d7bc376503393ca5f73f6f8d27c56b (patch)
tree7daa04400d833bd722258a49d56a39acfb392520 /Documentation/sysctl
parentea7c28518943b26a85d73cd76acd03b71962cb18 (diff)
parente9d848cb65d5f6f7731d12bd1b6d994bfdbcc94f (diff)
downloadlinux-d2950158d0d7bc376503393ca5f73f6f8d27c56b.tar.xz
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/sysctl')
-rw-r--r--Documentation/sysctl/kernel.txt2
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