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 /include/linux | |
| parent | afb71193a4d8e4a3c4c52a80a8cbee76582f0e90 (diff) | |
| parent | f1a527899ef0a8a241eb3bea619eb2e29d797f44 (diff) | |
| download | linux-stable-eff2108f020f30eb90462205ecf3ce10a420938b.tar.gz linux-stable-eff2108f020f30eb90462205ecf3ce10a420938b.tar.bz2 linux-stable-eff2108f020f30eb90462205ecf3ce10a420938b.zip | |
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 'include/linux')
| -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 6fddac1b27cb..74a4e14ab60b 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -390,8 +390,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; |