Merge git://git.infradead.org/mtd-2.6

[~andy/linux] / tools / perf / builtin-stat.c

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 21c025222496ae7dcadc24c052f3bcd93cd2ec94..e2109f9b43eb3ed99a5239805087277b229739d3 100644 (file)
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -333,6 +333,12 @@ static int run_perf_stat(int argc __used, const char **argv)
                }
        }
 
+       if (perf_evlist__set_filters(evsel_list)) {
+               error("failed to set filter with %d (%s)\n", errno,
+                       strerror(errno));
+               return -1;
+       }
+
        /*
         * Enable counters and exec the command:
         */
@@ -634,6 +640,8 @@ static const struct option options[] = {
        OPT_CALLBACK('e', "event", &evsel_list, "event",
                     "event selector. use 'perf list' to list available events",
                     parse_events),
+       OPT_CALLBACK(0, "filter", &evsel_list, "filter",
+                    "event filter", parse_filter),
        OPT_BOOLEAN('i', "no-inherit", &no_inherit,
                    "child tasks do not inherit counters"),
        OPT_INTEGER('p', "pid", &target_pid,