Merge 3.10-rc7 into driver-core-next

[~andy/linux] / include / linux / perf_event.h

diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index f463a46424e240715f2cc0c3bbf58f38955db1a8..c5b6dbf9c2fcd5c90d0b16d2e4e6e330af3ed0b0 100644 (file)
--- 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;