diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-06-19 12:44:41 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-06-19 12:44:41 +0200 |
commit | eff2108f020f30eb90462205ecf3ce10a420938b (patch) | |
tree | 27d1fc8ab23cd81e4863c29cddc0fbe8cfe68431 /kernel/events/internal.h | |
parent | afb71193a4d8e4a3c4c52a80a8cbee76582f0e90 (diff) | |
parent | f1a527899ef0a8a241eb3bea619eb2e29d797f44 (diff) |
Merge branch 'perf/urgent' into perf/core
Merge in the latest fixes, to avoid conflicts with ongoing work.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/events/internal.h')
-rw-r--r-- | kernel/events/internal.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/events/internal.h b/kernel/events/internal.h index eb675c4d59d..ca6599723be 100644 --- a/kernel/events/internal.h +++ b/kernel/events/internal.h @@ -31,6 +31,10 @@ struct ring_buffer { spinlock_t event_lock; struct list_head event_list; + atomic_t mmap_count; + unsigned long mmap_locked; + struct user_struct *mmap_user; + struct perf_event_mmap_page *user_page; void *data_pages[0]; }; |