---

yaml --- r: 242519 b: refs/heads/master c: 880f573 h: refs/heads/master i: 242517: 634620b 242515: 53374d3 242511: 8ef9da6 v: v3
git-mirror · Mar 23, 2011 · e7e731f · e7e731f
1 parent e82e9fc
commit e7e731f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68cacd29167b1926d237bd1b153aa2a990201729
+refs/heads/master: 880f57318450dbead6a03f9e31a1468924d6dd88
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
@@ -145,7 +145,8 @@ static struct srcu_struct pmus_srcu;
  */
 int sysctl_perf_event_paranoid __read_mostly = 1;
 
-int sysctl_perf_event_mlock __read_mostly = 512; /* 'free' kb per user */
+/* Minimum for 128 pages + 1 for the user control page */
+int sysctl_perf_event_mlock __read_mostly = 516; /* 'free' kb per user */
 
 /*
  * max perf event sample rate