diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-06-21 11:22:43 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-06-21 11:22:43 +0800 |
| commit | 9b0440e3b29f5f5340c247ac9699c53f585fa680 (patch) | |
| tree | 02d5133fcdfff78d094c73c5b76ca3f46da36266 /include/uapi/linux | |
| parent | 5db5b648730e1d70d07bfa21c28854c05d8d0329 (diff) | |
| parent | 46b4dd0c2535cbb70766f74bb9228ed81f59054d (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/perf_event.h | 1 |
1 files changed, 1 insertions, 0 deletions
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, |