Merge branch 'pm-cpufreq'

[cascardo/linux.git] / tools / perf / util / pmu.c

diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index d4b0e64..89c91a1 100644 (file)
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -462,10 +462,6 @@ static struct perf_pmu *pmu_lookup(const char *name)
        LIST_HEAD(aliases);
        __u32 type;
 
-       /* No support for intel_bts or intel_pt so disallow them */
-       if (!strcmp(name, "intel_bts") || !strcmp(name, "intel_pt"))
-               return NULL;
-
        /*
         * The pmu data we store & need consists of the pmu
         * type value and format definitions. Load both right
@@ -634,7 +630,9 @@ static char *formats_error_string(struct list_head *formats)
 {
        struct perf_pmu_format *format;
        char *err, *str;
-       static const char *static_terms = "config,config1,config2,name,period,branch_type,time\n";
+       static const char *static_terms = "config,config1,config2,name,"
+                                         "period,freq,branch_type,time,"
+                                         "call-graph,stack-size\n";
        unsigned i = 0;
 
        if (!asprintf(&str, "valid terms:"))