summaryrefslogtreecommitdiffstats
path: root/kernel/events
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2011-11-21 15:13:29 +0100
committerIngo Molnar <mingo@elte.hu>2011-12-21 11:01:05 +0100
commit9a0f05cb36888550d1509d60aa55788615abea44 (patch)
treedb001d4345d12cad98b7df4f29ca98e572087a7a /kernel/events
parentperf: Add support for PERF_HW_COUNT_REF_CPU_CYCLES (diff)
downloadlinux-9a0f05cb36888550d1509d60aa55788615abea44.tar.xz
linux-9a0f05cb36888550d1509d60aa55788615abea44.zip
perf: Update the mmap control page on mmap()
Apparently we didn't update the mmap control page right after mmap(), which leads to surprises when userspace wants to use it. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Stephane Eranian <eranian@google.com> Cc: Arun Sharma <asharma@fb.com> Link: http://lkml.kernel.org/n/tip-dcpi7164djsexmx6ya7lilrc@git.kernel.org Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/events')
-rw-r--r--kernel/events/core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 2f8f3f103cb4..0ca1f648ac08 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -3534,6 +3534,8 @@ static int perf_mmap(struct file *file, struct vm_area_struct *vma)
event->mmap_user = get_current_user();
vma->vm_mm->pinned_vm += event->mmap_locked;
+ perf_event_update_userpage(event);
+
unlock:
if (!ret)
atomic_inc(&event->mmap_count);