Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / kernel / events / internal.h

diff --git a/kernel/events/internal.h b/kernel/events/internal.h
index eb675c4d59dfd440b9f93d92226ee2dc5ffe8290..ca6599723be5624cdeb4a3cad5ef5dd10a4e1c7b 100644 (file)
--- 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];
 };