Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45d53766 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'trace-fixes-v3.10-rc5' of... 

Merge tag 'trace-fixes-v3.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull tracing fix from Steven Rostedt:
 "Yoshihiro Yunomae fixed a regression in the output format when using
  one of the counter clocks.

  The new multibuffer code changed the trace_clock file to update the
  trace instances tr->clock_id but the actual traces still used the
  value from the obsolete global variable trace_clock_id"

* tag 'trace-fixes-v3.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Fix outputting formats of x86-tsc and counter when use trace_clock
parents 8d7a8fe2 58e8eedf

kernel/trace/trace.c

+3 −5
Original line number Diff line number Diff line
@@ -652,8 +652,6 @@ static struct { 
	ARCH_TRACE_CLOCKS

};



int trace_clock_id;



/*

 * trace_parser_get_init - gets the buffer for trace parser

 */
@@ -2826,7 +2824,7 @@ __tracing_open(struct inode *inode, struct file *file, bool snapshot) 
		iter->iter_flags |= TRACE_FILE_ANNOTATE;



	/* Output in nanoseconds only if we are using a clock in nanoseconds. */

	if (trace_clocks[trace_clock_id].in_ns)

	if (trace_clocks[tr->clock_id].in_ns)

		iter->iter_flags |= TRACE_FILE_TIME_IN_NS;



	/* stop the trace while dumping if we are not opening "snapshot" */
@@ -3825,7 +3823,7 @@ static int tracing_open_pipe(struct inode *inode, struct file *filp) 
		iter->iter_flags |= TRACE_FILE_LAT_FMT;



	/* Output in nanoseconds only if we are using a clock in nanoseconds. */

	if (trace_clocks[trace_clock_id].in_ns)

	if (trace_clocks[tr->clock_id].in_ns)

		iter->iter_flags |= TRACE_FILE_TIME_IN_NS;



	iter->cpu_file = tc->cpu;
@@ -5095,7 +5093,7 @@ tracing_stats_read(struct file *filp, char __user *ubuf, 
	cnt = ring_buffer_bytes_cpu(trace_buf->buffer, cpu);

	trace_seq_printf(s, "bytes: %ld\n", cnt);



	if (trace_clocks[trace_clock_id].in_ns) {

	if (trace_clocks[tr->clock_id].in_ns) {

		/* local or global for trace_clock */

		t = ns2usecs(ring_buffer_oldest_event_ts(trace_buf->buffer, cpu));

		usec_rem = do_div(t, USEC_PER_SEC);

kernel/trace/trace.h

+0 −2
Original line number Diff line number Diff line
@@ -700,8 +700,6 @@ enum print_line_t print_trace_line(struct trace_iterator *iter); 


extern unsigned long trace_flags;



extern int trace_clock_id;



/* Standard output formatting function used for function return traces */

#ifdef CONFIG_FUNCTION_GRAPH_TRACER