Merge branch 'perf/urgent' into perf/core, to pick up fixes

[linux-2.6-block.git] / Documentation / sysctl / kernel.txt

diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
index 260cde08e92e828a842cbd780e70bec72d7d3826..daabdd7ee543ea7f8bfe61274869ded73f353a94 100644 (file)
--- 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