summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-12-19 09:10:46 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-12-19 09:10:46 -0800
commit58cac3faefe26794dacda190dbd7bf374e3516d2 (patch)
treee86765ea91c5ef5c2bba93af048bc0be74e3a61f /include
parent9b1be0f976a158590b924ac8789afe69b06dd302 (diff)
parent189b84fb54490ae24111124346a8e63f8e019385 (diff)
downloadlinux-58cac3faefe26794dacda190dbd7bf374e3516d2.tar.bz2
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar: "An ABI documentation fix, and a mixed-PMU perf-info-corruption fix" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf: Document the new transaction sample type perf: Disable all pmus on unthrottling and rescheduling
Diffstat (limited to 'include')
-rw-r--r--include/uapi/linux/perf_event.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index e1802d6153ae..959d454f76a1 100644
--- 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,