Merge branch 'perf/urgent' into perf/core, to resolve conflict and to prepare for...

[karo-tx-linux.git] / include / linux / perf_event.h

diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 9b5cd1992a88ccf8d5e15ca54936c6145ee0878f..b4c1d4685bf05031b446ac0b90b3df9b0bca070d 100644 (file)
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -166,17 +166,28 @@ struct perf_event;
  */
 #define PERF_EVENT_TXN 0x1
 
+/**
+ * pmu::capabilities flags
+ */
+#define PERF_PMU_CAP_NO_INTERRUPT              0x01
+
 /**
  * struct pmu - generic performance monitoring unit
  */
 struct pmu {
        struct list_head                entry;
 
+       struct module                   *module;
        struct device                   *dev;
        const struct attribute_group    **attr_groups;
        const char                      *name;
        int                             type;
 
+       /*
+        * various common per-pmu feature flags
+        */
+       int                             capabilities;
+
        int * __percpu                  pmu_disable_count;
        struct perf_cpu_context * __percpu pmu_cpu_context;
        int                             task_ctx_nr;