diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-20 08:17:36 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-20 08:17:36 -1000 |
| commit | 86c76676cfdbf283f6131d5a2783bed3f3d490ea (patch) | |
| tree | a4062bcf58783950768e68fcd5321ce0630fd9fc /include | |
| parent | 805e318548fa0f6007bcece06bde1ddd9393246c (diff) | |
| parent | f1a527899ef0a8a241eb3bea619eb2e29d797f44 (diff) | |
| download | linux-86c76676cfdbf283f6131d5a2783bed3f3d490ea.tar.bz2 | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"Four fixes. The mmap ones are unfortunately larger than desired -
fuzzing uncovered bugs that needed perf context life time management
changes to fix properly"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/x86: Fix broken PEBS-LL support on SNB-EP/IVB-EP
perf: Fix mmap() accounting hole
perf: Fix perf mmap bugs
kprobes: Fix to free gone and unused optprobes
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/perf_event.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index f463a46424e2..c5b6dbf9c2fc 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -389,8 +389,7 @@ struct perf_event { /* mmap bits */ struct mutex mmap_mutex; atomic_t mmap_count; - int mmap_locked; - struct user_struct *mmap_user; + struct ring_buffer *rb; struct list_head rb_entry; |