4 files changed, 18 insertions, 39 deletions

diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 8e7509f2d882..2c309a5c6868 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -323,6 +323,7 @@ LIB_H += ../../include/linux/rbtree.h
 LIB_H += ../../include/linux/list.h
 LIB_H += util/include/linux/list.h
 LIB_H += perf.h
+LIB_H += util/event.h
 LIB_H += util/types.h
 LIB_H += util/levenshtein.h
 LIB_H += util/parse-options.h
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 855094234f2d..35ed97bd0c63 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -29,7 +29,6 @@ static char		const *input_name = "perf.data";
 
 static int              force;
 static int              input;
-static int              show_mask = SHOW_KERNEL | SHOW_USER | SHOW_HV;
 
 static int              full_paths;
 
@@ -97,7 +96,6 @@ static int
 process_sample_event(event_t *event, unsigned long offset, unsigned long head)
 {
         char level;
-        int show = 0;
         struct thread *thread;
         u64 ip = event->ip.ip;
         struct map *map = NULL;
@@ -121,13 +119,11 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head)
         }
 
         if (event->header.misc & PERF_RECORD_MISC_KERNEL) {
-                show = SHOW_KERNEL;
                 level = 'k';
                 sym = kernel_maps__find_symbol(ip, &map);
                 dump_printf(" ...... dso: %s\n",
                             map ? map->dso->long_name : "<not found>");
         } else if (event->header.misc & PERF_RECORD_MISC_USER) {
-                show = SHOW_USER;
                 level = '.';
                 map = thread__find_map(thread, ip);
                 if (map != NULL) {
@@ -153,17 +149,14 @@ got_map:
                 dump_printf(" ...... dso: %s\n",
                             map ? map->dso->long_name : "<not found>");
         } else {
-                show = SHOW_HV;
                 level = 'H';
                 dump_printf(" ...... dso: [hypervisor]\n");
         }
 
-        if (show & show_mask) {
-                if (hist_entry__add(thread, map, sym, ip, 1, level)) {
-                        fprintf(stderr,
-                "problem incrementing symbol count, skipping event\n");
-                        return -1;
-                }
+        if (hist_entry__add(thread, map, sym, ip, 1, level)) {
+                fprintf(stderr, "problem incrementing symbol count, "
+                                "skipping event\n");
+                return -1;
         }
         total++;
 
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 0e83ffcbe55a..fe4aadc9630f 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -38,7 +38,6 @@ static struct strlist	*dso_list, *comm_list, *sym_list;
 
 static int              force;
 static int              input;
-static int              show_mask = SHOW_KERNEL | SHOW_USER | SHOW_HV;
 
 static int              full_paths;
 static int              show_nr_samples;
@@ -600,7 +599,6 @@ static int
 process_sample_event(event_t *event, unsigned long offset, unsigned long head)
 {
         char level;
-        int show = 0;
         struct symbol *sym = NULL;
         struct thread *thread;
         u64 ip = event->ip.ip;
@@ -657,42 +655,35 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head)
         cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;
 
         if (cpumode == PERF_RECORD_MISC_KERNEL) {
-                show = SHOW_KERNEL;
                 level = 'k';
-
                 sym = kernel_maps__find_symbol(ip, &map);
                 dump_printf(" ...... dso: %s\n",
                             map ? map->dso->long_name : "<not found>");
         } else if (cpumode == PERF_RECORD_MISC_USER) {
-
-                show = SHOW_USER;
                 level = '.';
                 sym = resolve_symbol(thread, &map, &ip);
 
         } else {
-                show = SHOW_HV;
                 level = 'H';
-
                 dump_printf(" ...... dso: [hypervisor]\n");
         }
 
-        if (show & show_mask) {
-                if (dso_list &&
-                    (!map || !map->dso ||
-                     !(strlist__has_entry(dso_list, map->dso->short_name) ||
-                       (map->dso->short_name != map->dso->long_name &&
-                        strlist__has_entry(dso_list, map->dso->long_name)))))
-                        return 0;
+        if (dso_list &&
+            (!map || !map->dso ||
+             !(strlist__has_entry(dso_list, map->dso->short_name) ||
+               (map->dso->short_name != map->dso->long_name &&
+                strlist__has_entry(dso_list, map->dso->long_name)))))
+                return 0;
 
-                if (sym_list && sym && !strlist__has_entry(sym_list, sym->name))
-                        return 0;
+        if (sym_list && sym && !strlist__has_entry(sym_list, sym->name))
+                return 0;
 
-                if (hist_entry__add(thread, map, sym, ip,
-                                    chain, level, period)) {
-                        eprintf("problem incrementing symbol count, skipping event\n");
-                        return -1;
-                }
+        if (hist_entry__add(thread, map, sym, ip,
+                            chain, level, period)) {
+                eprintf("problem incrementing symbol count, skipping event\n");
+                return -1;
         }
+
         total += period;
 
         return 0;
diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index a39520e6ae8f..c2e62be62798 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -6,12 +6,6 @@
 #include <linux/list.h>
 #include <linux/rbtree.h>
 
-enum {
-        SHOW_KERNEL     = 1,
-        SHOW_USER       = 2,
-        SHOW_HV         = 4,
-};
-
 /*
  * PERF_SAMPLE_IP | PERF_SAMPLE_TID | *
  */