diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-04-02 16:51:24 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-04-02 16:51:24 +0200 |
| commit | 1cd9f73030162463bb4d88a06f2084d34c41e756 (patch) | |
| tree | fb9b3e1a21a136fa6bab3dc24832a69c38836598 /kernel | |
| parent | d0a0155b91705784aa977b11c6e9ded33fc458ba (diff) | |
| parent | fd1edb3aa2c1d92618d8f0c6d15d44ea41fcac6a (diff) | |
Merge branch 'perf/urgent' into auto-latest
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/perf_event.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index c75925c4d1e2..27960f114efd 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c @@ -145,8 +145,8 @@ static struct srcu_struct pmus_srcu; */ int sysctl_perf_event_paranoid __read_mostly = 1; -/* Minimum for 128 pages + 1 for the user control page */ -int sysctl_perf_event_mlock __read_mostly = 516; /* 'free' kb per user */ +/* Minimum for 512 kiB + 1 user control page */ +int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */ /* * max perf event sample rate @@ -6531,6 +6531,11 @@ SYSCALL_DEFINE5(perf_event_open, goto err_alloc; } + if (task) { + put_task_struct(task); + task = NULL; + } + /* * Look up the group leader (we will attach this event to it): */ |