diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-10-26 07:14:02 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-10-26 07:14:02 -0400 |
commit | 5c16d2c813a7490408e966f52b881e70fc8d7f77 (patch) | |
tree | 3a2a4286a674d2e009f84687b5d0b74809774c28 /include | |
parent | 5df414c61e1b6f15bdc3759f292c7404286c9827 (diff) | |
parent | b8b2663bd7c9da04ac804659b9f617c199d0252c (diff) |
Merge branch 'tip/perf/ringbuffer-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/ring_buffer.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h index 25b4f686d918..8d3a2486544d 100644 --- a/include/linux/ring_buffer.h +++ b/include/linux/ring_buffer.h | |||
@@ -62,18 +62,6 @@ enum ring_buffer_type { | |||
62 | unsigned ring_buffer_event_length(struct ring_buffer_event *event); | 62 | unsigned ring_buffer_event_length(struct ring_buffer_event *event); |
63 | void *ring_buffer_event_data(struct ring_buffer_event *event); | 63 | void *ring_buffer_event_data(struct ring_buffer_event *event); |
64 | 64 | ||
65 | /** | ||
66 | * ring_buffer_event_time_delta - return the delta timestamp of the event | ||
67 | * @event: the event to get the delta timestamp of | ||
68 | * | ||
69 | * The delta timestamp is the 27 bit timestamp since the last event. | ||
70 | */ | ||
71 | static inline unsigned | ||
72 | ring_buffer_event_time_delta(struct ring_buffer_event *event) | ||
73 | { | ||
74 | return event->time_delta; | ||
75 | } | ||
76 | |||
77 | /* | 65 | /* |
78 | * ring_buffer_discard_commit will remove an event that has not | 66 | * ring_buffer_discard_commit will remove an event that has not |
79 | * ben committed yet. If this is used, then ring_buffer_unlock_commit | 67 | * ben committed yet. If this is used, then ring_buffer_unlock_commit |