aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-12 07:40:08 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-12 07:40:08 +0100
commitf3134de60624829a57741c1f3796847d4de165f6 (patch)
tree7e05f048d7a6ac115b4e4acc4db0296d84d1e7d5
parente726f5f91effd8944c76475a2688093a03ba0d10 (diff)
parent361b73d5c34f59c3fd107bb9dbe7a1fbff2c2517 (diff)
Merge branches 'tracing/function-graph-tracer' and 'tracing/ring-buffer' into tracing/core
-rw-r--r--include/linux/ring_buffer.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h
index 1a350a847ed..d363467c8f1 100644
--- a/include/linux/ring_buffer.h
+++ b/include/linux/ring_buffer.h
@@ -28,17 +28,19 @@ struct ring_buffer_event {
* size = 8 bytes
*
* @RINGBUF_TYPE_TIME_STAMP: Sync time stamp with external clock
- * array[0] = tv_nsec
- * array[1] = tv_sec
+ * array[0] = tv_nsec
+ * array[1..2] = tv_sec
* size = 16 bytes
*
* @RINGBUF_TYPE_DATA: Data record
* If len is zero:
* array[0] holds the actual length
- * array[1..(length+3)/4-1] holds data
+ * array[1..(length+3)/4] holds data
+ * size = 4 + 4 + length (bytes)
* else
* length = len << 2
- * array[0..(length+3)/4] holds data
+ * array[0..(length+3)/4-1] holds data
+ * size = 4 + length (bytes)
*/
enum ring_buffer_type {
RINGBUF_TYPE_PADDING,