tracing: Remove cpu arg from the rb_time_stamp() function

Gitweb:     http://git.kernel.org/linus/6d3f1e12f46a2f9a1bb7e7aa433df8dd31ce5647
Commit:     6d3f1e12f46a2f9a1bb7e7aa433df8dd31ce5647
Parent:     67b394f7f26d84edb7294cc6528ab7ca6daa2ad1
Author:     Jiri Olsa <jolsa <at> redhat.com>
AuthorDate: Fri Oct 23 19:36:19 2009 -0400
Committer:  Ingo Molnar <mingo <at> elte.hu>
CommitDate: Sat Oct 24 11:07:51 2009 +0200

    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: Jiri Olsa <jolsa <at> redhat.com>
    Signed-off-by: Steven Rostedt <rostedt <at> goodmis.org>
    Cc: Frederic Weisbecker <fweisbec <at> gmail.com>
    LKML-Reference: <20091023233647.118547500 <at> goodmis.org>
    Signed-off-by: Ingo Molnar <mingo <at> elte.hu>
---
 include/linux/trace_seq.h  |    2 +-
 kernel/trace/ring_buffer.c |   10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/linux/trace_seq.h b/include/linux/trace_seq.h
index c134dd1..09077f6 100644
--- a/include/linux/trace_seq.h
+++ b/include/linux/trace_seq.h
 <at>  <at>  -7,7 +7,7  <at>  <at> 

 /*
  * 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 {
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 217f699..3ffa502 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
 <at>  <at>  -483,7 +483,7  <at>  <at>  struct ring_buffer_iter {
 /* Up this if you want to test the TIME_EXTENTS and normalization */
 #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 */
 	return buffer->clock() << DEBUG_SHIFT;
 <at>  <at>  -494,7 +494,7  <at>  <at>  u64 ring_buffer_time_stamp(struct ring_buffer *buffer, int cpu)
 	u64 time;

 	preempt_disable_notrace();
-	time = rb_time_stamp(buffer, cpu);
+	time = rb_time_stamp(buffer);
 	preempt_enable_no_resched_notrace();

 	return time;
 <at>  <at>  -599,7 +599,7  <at>  <at>  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
  * not trust what the head page is (it may be pointing to
 <at>  <at>  -1868,7 +1868,7  <at>  <at>  rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
 		 * Nested commits always have zero deltas, so
 		 * just reread the time stamp
 		 */
-		*ts = rb_time_stamp(buffer, cpu_buffer->cpu);
+		*ts = rb_time_stamp(buffer);
 		next_page->page->time_stamp = *ts;
 	}

 <at>  <at>  -2111,7 +2111,7  <at>  <at>  rb_reserve_next_event(struct ring_buffer *buffer,
 	if (RB_WARN_ON(cpu_buffer, ++nr_loops > 1000))
 		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.
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo <at> vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html