perf_counter: Remove munmap stuff

In name of keeping it simple, only track mmap events. Userspace
will have to remove old overlapping maps when it encounters them.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 10 deletions

diff --git a/include/linux/perf_counter.h b/include/linux/perf_counter.h
index 380247bdb918..6ca403acd419 100644
--- a/include/linux/perf_counter.h
+++ b/include/linux/perf_counter.h
@@ -148,11 +148,10 @@ struct perf_counter_attr {
                                 exclude_hv     :  1, /* ditto hypervisor      */
                                 exclude_idle   :  1, /* don't count when idle */
                                 mmap           :  1, /* include mmap data     */
-                                munmap         :  1, /* include munmap data   */
                                 comm           :  1, /* include comm data     */
                                 freq           :  1, /* use freq, not period  */
 
-                                __reserved_1   : 52;
+                                __reserved_1   : 53;
 
         __u32                   wakeup_events;  /* wakeup every n events */
         __u32                   __reserved_2;
@@ -246,7 +245,6 @@ enum perf_event_type {
          * };
          */
         PERF_EVENT_MMAP                 = 1,
-        PERF_EVENT_MUNMAP               = 2,
 
         /*
          * struct {
@@ -622,9 +620,6 @@ extern void perf_swcounter_event(u32, u64, int, struct pt_regs *, u64);
 extern void perf_counter_mmap(unsigned long addr, unsigned long len,
                               unsigned long pgoff, struct file *file);
 
-extern void perf_counter_munmap(unsigned long addr, unsigned long len,
-                                unsigned long pgoff, struct file *file);
-
 extern void perf_counter_comm(struct task_struct *tsk);
 extern void perf_counter_fork(struct task_struct *tsk);
 
@@ -677,10 +672,6 @@ static inline void
 perf_counter_mmap(unsigned long addr, unsigned long len,
                   unsigned long pgoff, struct file *file)               { }
 
-static inline void
-perf_counter_munmap(unsigned long addr, unsigned long len,
-                    unsigned long pgoff, struct file *file)             { }
-
 static inline void perf_counter_comm(struct task_struct *tsk)           { }
 static inline void perf_counter_fork(struct task_struct *tsk)           { }
 static inline void perf_counter_init(void)                              { }