Merge branch 'tip/perf/ringbuffer-2' of git://git.kernel.org/pub/scm/…

…linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
git-mirror · Oct 26, 2010 · 5c16d2c · 5c16d2c
2 parents 5df414c + b8b2663
commit 5c16d2c
Show file tree

Hide file tree

Showing 2 changed files with 172 additions and 175 deletions.
diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h
@@ -62,18 +62,6 @@ enum ring_buffer_type {
 unsigned ring_buffer_event_length(struct ring_buffer_event *event);
 void *ring_buffer_event_data(struct ring_buffer_event *event);
 
-/**
- * ring_buffer_event_time_delta - return the delta timestamp of the event
- * @event: the event to get the delta timestamp of
- *
- * The delta timestamp is the 27 bit timestamp since the last event.
- */
-static inline unsigned
-ring_buffer_event_time_delta(struct ring_buffer_event *event)
-{
-	return event->time_delta;
-}
-
 /*
  * ring_buffer_discard_commit will remove an event that has not
  *   ben committed yet. If this is used, then ring_buffer_unlock_commit