diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-11 02:50:05 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-11 02:50:05 -0500 |
| commit | 73cf7e111ed69d8e1b59a3ae41b14bc77215e9ee (patch) | |
| tree | 02cd3308d328bce9cf97bf2c1c9d5e932103ebfe /tools/include/uapi/linux/perf_event.h | |
| parent | 328257099077e8affd438c179d8a938948de2e7f (diff) | |
| parent | 50c4c4e268a2d7a3e58ebb698ac74da0de40ae36 (diff) | |
Merge 4.15-rc3 into driver-core-next
We want the fixes and changes in here for testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/include/uapi/linux/perf_event.h')
| -rw-r--r-- | tools/include/uapi/linux/perf_event.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/include/uapi/linux/perf_event.h b/tools/include/uapi/linux/perf_event.h index 362493a2f950..b9a4953018ed 100644 --- a/tools/include/uapi/linux/perf_event.h +++ b/tools/include/uapi/linux/perf_event.h | |||
| @@ -942,6 +942,7 @@ enum perf_callchain_context { | |||
| 942 | #define PERF_AUX_FLAG_TRUNCATED 0x01 /* record was truncated to fit */ | 942 | #define PERF_AUX_FLAG_TRUNCATED 0x01 /* record was truncated to fit */ |
| 943 | #define PERF_AUX_FLAG_OVERWRITE 0x02 /* snapshot from overwrite mode */ | 943 | #define PERF_AUX_FLAG_OVERWRITE 0x02 /* snapshot from overwrite mode */ |
| 944 | #define PERF_AUX_FLAG_PARTIAL 0x04 /* record contains gaps */ | 944 | #define PERF_AUX_FLAG_PARTIAL 0x04 /* record contains gaps */ |
| 945 | #define PERF_AUX_FLAG_COLLISION 0x08 /* sample collided with another */ | ||
| 945 | 946 | ||
| 946 | #define PERF_FLAG_FD_NO_GROUP (1UL << 0) | 947 | #define PERF_FLAG_FD_NO_GROUP (1UL << 0) |
| 947 | #define PERF_FLAG_FD_OUTPUT (1UL << 1) | 948 | #define PERF_FLAG_FD_OUTPUT (1UL << 1) |