Commit 6d3f1e12 authored by Jiri Olsa's avatar Jiri Olsa Committed by Ingo Molnar

tracing: Remove cpu arg from the rb_time_stamp() function

The cpu argument is not used inside the rb_time_stamp() function.
Plus fix a typo.
Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <20091023233647.118547500@goodmis.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 67b394f7
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
/* /*
* Trace sequences are used to allow a function to call several other functions * Trace sequences are used to allow a function to call several other functions
* to create a string of data to use (up to a max of PAGE_SIZE. * to create a string of data to use (up to a max of PAGE_SIZE).
*/ */
struct trace_seq { struct trace_seq {
......
...@@ -483,7 +483,7 @@ struct ring_buffer_iter { ...@@ -483,7 +483,7 @@ struct ring_buffer_iter {
/* Up this if you want to test the TIME_EXTENTS and normalization */ /* Up this if you want to test the TIME_EXTENTS and normalization */
#define DEBUG_SHIFT 0 #define DEBUG_SHIFT 0
static inline u64 rb_time_stamp(struct ring_buffer *buffer, int cpu) static inline u64 rb_time_stamp(struct ring_buffer *buffer)
{ {
/* shift to debug/test normalization and TIME_EXTENTS */ /* shift to debug/test normalization and TIME_EXTENTS */
return buffer->clock() << DEBUG_SHIFT; return buffer->clock() << DEBUG_SHIFT;
...@@ -494,7 +494,7 @@ u64 ring_buffer_time_stamp(struct ring_buffer *buffer, int cpu) ...@@ -494,7 +494,7 @@ u64 ring_buffer_time_stamp(struct ring_buffer *buffer, int cpu)
u64 time; u64 time;
preempt_disable_notrace(); preempt_disable_notrace();
time = rb_time_stamp(buffer, cpu); time = rb_time_stamp(buffer);
preempt_enable_no_resched_notrace(); preempt_enable_no_resched_notrace();
return time; return time;
...@@ -599,7 +599,7 @@ static struct list_head *rb_list_head(struct list_head *list) ...@@ -599,7 +599,7 @@ static struct list_head *rb_list_head(struct list_head *list)
} }
/* /*
* rb_is_head_page - test if the give page is the head page * rb_is_head_page - test if the given page is the head page
* *
* Because the reader may move the head_page pointer, we can * Because the reader may move the head_page pointer, we can
* not trust what the head page is (it may be pointing to * not trust what the head page is (it may be pointing to
...@@ -1868,7 +1868,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer, ...@@ -1868,7 +1868,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
* Nested commits always have zero deltas, so * Nested commits always have zero deltas, so
* just reread the time stamp * just reread the time stamp
*/ */
*ts = rb_time_stamp(buffer, cpu_buffer->cpu); *ts = rb_time_stamp(buffer);
next_page->page->time_stamp = *ts; next_page->page->time_stamp = *ts;
} }
...@@ -2111,7 +2111,7 @@ rb_reserve_next_event(struct ring_buffer *buffer, ...@@ -2111,7 +2111,7 @@ rb_reserve_next_event(struct ring_buffer *buffer,
if (RB_WARN_ON(cpu_buffer, ++nr_loops > 1000)) if (RB_WARN_ON(cpu_buffer, ++nr_loops > 1000))
goto out_fail; goto out_fail;
ts = rb_time_stamp(cpu_buffer->buffer, cpu_buffer->cpu); ts = rb_time_stamp(cpu_buffer->buffer);
/* /*
* Only the first commit can update the timestamp. * Only the first commit can update the timestamp.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment