Messages in this thread | | | Subject | Re: [PATCH 4/4] tracing: removing cpu arg from rb_time_stamp function | From | Steven Rostedt <> | Date | Wed, 21 Oct 2009 12:24:19 -0400 |
| |
On Wed, 2009-10-21 at 16:36 +0200, Jiri Olsa wrote: > The cpu argument is not used inside rb_time_stamp function. Plus typo fix. > > Signed-off-by: Jiri Olsa <jolsa@redhat.com> > --- > 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 > @@ -7,7 +7,7 @@ > > /* > * 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 d33e5ca..63446f1 100644 > --- a/kernel/trace/ring_buffer.c > +++ b/kernel/trace/ring_buffer.c > @@ -486,7 +486,7 @@ 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; > @@ -497,7 +497,7 @@ 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);
Yeah, originally this was to deal with cpu_clock() which takes cpu as its parameter. But we now just call "raw_smp_processor_id" instead directly when using cpu_clock.
Thanks,
-- Steve
> preempt_enable_no_resched_notrace(); > > return time; > @@ -602,7 +602,7 @@ static struct list_head *rb_list_head(struct list_head *list) > } >
| |