diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-06-21 11:14:16 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-06-21 11:14:16 +0800 |
| commit | 46b4dd0c2535cbb70766f74bb9228ed81f59054d (patch) | |
| tree | 7a6b9088c87e3532cef5f570d84e3f6481d88510 /include | |
| parent | c66b2190a13e321233ac1349d238d699dffefe09 (diff) | |
| parent | 09e1b6ffeb1b6706c441f9369be027e7ad5d56c1 (diff) | |
Merge branch 'v4.4/topic/coresight' into linux-linaro-lsk-v4.4
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/perf_event.h | 11 | ||||
| -rw-r--r-- | include/uapi/linux/perf_event.h | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index f9828a48f16a..ece8b9629a47 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -378,7 +378,7 @@ struct pmu { /* * Set up pmu-private data structures for an AUX area */ - void *(*setup_aux) (int cpu, void **pages, + void *(*setup_aux) (struct perf_event *event, void **pages, int nr_pages, bool overwrite); /* optional */ @@ -391,6 +391,14 @@ struct pmu { * Filter events for PMU-specific reasons. */ int (*filter_match) (struct perf_event *event); /* optional */ + + /* + * Initial, PMU driver specific configuration. + */ + int (*get_drv_configs) (struct perf_event *event, + void __user *arg); /* optional */ + void (*free_drv_configs) (struct perf_event *event); + /* optional */ }; /** @@ -558,6 +566,7 @@ struct perf_event { struct irq_work pending; atomic_t event_limit; + struct list_head drv_configs; void (*destroy)(struct perf_event *); struct rcu_head rcu_head; diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h index d801bb0d9f6d..cd2e88450faa 100644 --- a/include/uapi/linux/perf_event.h +++ b/include/uapi/linux/perf_event.h @@ -395,6 +395,7 @@ struct perf_event_attr { #define PERF_EVENT_IOC_SET_FILTER _IOW('$', 6, char *) #define PERF_EVENT_IOC_ID _IOR('$', 7, __u64 *) #define PERF_EVENT_IOC_SET_BPF _IOW('$', 8, __u32) +#define PERF_EVENT_IOC_SET_DRV_CONFIGS _IOW('$', 10, char *) enum perf_event_ioc_flags { PERF_IOC_FLAG_GROUP = 1U << 0, |