projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.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];
};