diff --git a/[refs] b/[refs] index bd7c2b9e8bd1..30710e945b2d 100644 --- 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 index 0c714226ae0c..c75925c4d1e2 100644 --- 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