diff options
Diffstat (limited to 'tools/perf/util/pmu.h')
| -rw-r--r-- | tools/perf/util/pmu.h | 21 | 
1 files changed, 6 insertions, 15 deletions
diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h index 39f3abac774..32fe55b659f 100644 --- a/tools/perf/util/pmu.h +++ b/tools/perf/util/pmu.h @@ -2,7 +2,7 @@  #define __PMU_H  #include <linux/bitops.h> -#include "../../../include/uapi/linux/perf_event.h" +#include <linux/perf_event.h>  enum {  	PERF_PMU_FORMAT_VALUE_CONFIG, @@ -12,19 +12,6 @@ enum {  #define PERF_PMU_FORMAT_BITS 64 -struct perf_pmu__format { -	char *name; -	int value; -	DECLARE_BITMAP(bits, PERF_PMU_FORMAT_BITS); -	struct list_head list; -}; - -struct perf_pmu__alias { -	char *name; -	struct list_head terms; -	struct list_head list; -}; -  struct perf_pmu {  	char *name;  	__u32 type; @@ -37,15 +24,19 @@ struct perf_pmu {  struct perf_pmu *perf_pmu__find(char *name);  int perf_pmu__config(struct perf_pmu *pmu, struct perf_event_attr *attr,  		     struct list_head *head_terms); +int perf_pmu__config_terms(struct list_head *formats, +			   struct perf_event_attr *attr, +			   struct list_head *head_terms);  int perf_pmu__check_alias(struct perf_pmu *pmu, struct list_head *head_terms);  struct list_head *perf_pmu__alias(struct perf_pmu *pmu, -				struct list_head *head_terms); +				  struct list_head *head_terms);  int perf_pmu_wrap(void);  void perf_pmu_error(struct list_head *list, char *name, char const *msg);  int perf_pmu__new_format(struct list_head *list, char *name,  			 int config, unsigned long *bits);  void perf_pmu__set_format(unsigned long *bits, long from, long to); +int perf_pmu__format_parse(char *dir, struct list_head *head);  struct perf_pmu *perf_pmu__scan(struct perf_pmu *pmu);  |