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

[linux-2.6-block.git] / kernel / events / core.c

diff --git a/kernel/events/core.c b/kernel/events/core.c
index fc0290f25482201f1226c5a1cbcc0b7b4f2c160b..050a290c72c7b9fd09964f0028aaec11f0f246a1 100644 (file)
--- 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 */