diff options
author | 2016-05-11 16:56:38 +0200 | |
---|---|---|
committer | 2016-05-11 16:56:38 +0200 | |
commit | d2950158d0d7bc376503393ca5f73f6f8d27c56b (patch) | |
tree | 7daa04400d833bd722258a49d56a39acfb392520 /kernel/events | |
parent | Merge tag 'perf-core-for-mingo-20160506' of git://git.kernel.org/pub/scm/linu... (diff) | |
parent | perf diff: Fix duplicated output column (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 'kernel/events')
-rw-r--r-- | kernel/events/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index fc0290f25482..050a290c72c7 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -353,7 +353,7 @@ static struct srcu_struct pmus_srcu; * 1 - disallow cpu events for unpriv * 2 - disallow kernel profiling for unpriv */ -int sysctl_perf_event_paranoid __read_mostly = 1; +int sysctl_perf_event_paranoid __read_mostly = 2; /* Minimum for 512 kiB + 1 user control page */ int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */ |