| @@ -771,7 +771,7 @@ static u64 buffer_ftrace_now(struct array_buffer *buf, int cpu) · 770 unmodified lines |
| 771 | if (!buf->buffer) | 771 | if (!buf->buffer) |
| 772 | return trace_clock_local(); | 772 | return trace_clock_local(); |
| 773 | | 773 | |
| 774 | ts = ring_buffer_time_stamp(buf->buffer, cpu); | 774 | ts = ring_buffer_time_stamp(buf->buffer); |
| 775 | ring_buffer_normalize_time_stamp(buf->buffer, cpu, &ts); | 775 | ring_buffer_normalize_time_stamp(buf->buffer, cpu, &ts); |
| 776 | | 776 | |
| 777 | return ts; | 777 | return ts; |
| @@ -7174,7 +7174,7 @@ static int tracing_time_stamp_mode_open(struct inode *inode, struct file *file) · 6396 unmodified lines |
| 7174 | u64 tracing_event_time_stamp(struct trace_buffer *buffer, struct ring_buffer_event *rbe) | 7174 | u64 tracing_event_time_stamp(struct trace_buffer *buffer, struct ring_buffer_event *rbe) |
| 7175 | { | 7175 | { |
| 7176 | if (rbe == this_cpu_read(trace_buffered_event)) | 7176 | if (rbe == this_cpu_read(trace_buffered_event)) |
| 7177 | return ring_buffer_time_stamp(buffer, smp_processor_id()); | 7177 | return ring_buffer_time_stamp(buffer); |
| 7178 | | 7178 | |
| 7179 | return ring_buffer_event_time_stamp(buffer, rbe); | 7179 | return ring_buffer_event_time_stamp(buffer, rbe); |
| 7180 | } | 7180 | } |
| @@ -8088,7 +8088,7 @@ tracing_stats_read(struct file *filp, char __user *ubuf, · 907 unmodified lines |
| 8088 | trace_seq_printf(s, "oldest event ts: %5llu.%06lu\n", | 8088 | trace_seq_printf(s, "oldest event ts: %5llu.%06lu\n", |
| 8089 | t, usec_rem); | 8089 | t, usec_rem); |
| 8090 | | 8090 | |
| 8091 | t = ns2usecs(ring_buffer_time_stamp(trace_buf->buffer, cpu)); | 8091 | t = ns2usecs(ring_buffer_time_stamp(trace_buf->buffer)); |
| 8092 | usec_rem = do_div(t, USEC_PER_SEC); | 8092 | usec_rem = do_div(t, USEC_PER_SEC); |
| 8093 | trace_seq_printf(s, "now ts: %5llu.%06lu\n", t, usec_rem); | 8093 | trace_seq_printf(s, "now ts: %5llu.%06lu\n", t, usec_rem); |
| 8094 | } else { | 8094 | } else { |
| @@ -8097,7 +8097,7 @@ tracing_stats_read(struct file *filp, char __user *ubuf, · 2 unmodified lines |
| 8097 | ring_buffer_oldest_event_ts(trace_buf->buffer, cpu)); | 8097 | ring_buffer_oldest_event_ts(trace_buf->buffer, cpu)); |
| 8098 | | 8098 | |
| 8099 | trace_seq_printf(s, "now ts: %llu\n", | 8099 | trace_seq_printf(s, "now ts: %llu\n", |
| 8100 | ring_buffer_time_stamp(trace_buf->buffer, cpu)); | 8100 | ring_buffer_time_stamp(trace_buf->buffer)); |
| 8101 | } | 8101 | } |
| 8102 | | 8102 | |
| 8103 | cnt = ring_buffer_dropped_events_cpu(trace_buf->buffer, cpu); | 8103 | cnt = ring_buffer_dropped_events_cpu(trace_buf->buffer, cpu); |