projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'perf/urgent' into perf/core
[firefly-linux-kernel-4.4.55.git]
/
include
/
uapi
/
linux
/
perf_event.h
diff --git
a/include/uapi/linux/perf_event.h
b/include/uapi/linux/perf_event.h
index ca018b4085c6b32baa5b5563e1fbb0cbbebde7bf..e244ed412745e544cf480c549d2439c6522cfb98 100644
(file)
--- a/
include/uapi/linux/perf_event.h
+++ b/
include/uapi/linux/perf_event.h
@@
-679,6
+679,7
@@
enum perf_event_type {
*
* { u64 weight; } && PERF_SAMPLE_WEIGHT
* { u64 data_src; } && PERF_SAMPLE_DATA_SRC
+ * { u64 transaction; } && PERF_SAMPLE_TRANSACTION
* };
*/
PERF_RECORD_SAMPLE = 9,