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

Commit c716ef56 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tip/perf/urgent-2' of... 

Merge branch 'tip/perf/urgent-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/urgent
parents b64909af db4c75cb

kernel/trace/trace.c

+5 −3
Original line number Diff line number Diff line
@@ -4629,7 +4629,8 @@ static ssize_t 
rb_simple_read(struct file *filp, char __user *ubuf,

	       size_t cnt, loff_t *ppos)

{

	struct ring_buffer *buffer = filp->private_data;

	struct trace_array *tr = filp->private_data;

	struct ring_buffer *buffer = tr->buffer;

	char buf[64];

	int r;
@@ -4647,7 +4648,8 @@ static ssize_t 
rb_simple_write(struct file *filp, const char __user *ubuf,

		size_t cnt, loff_t *ppos)

{

	struct ring_buffer *buffer = filp->private_data;

	struct trace_array *tr = filp->private_data;

	struct ring_buffer *buffer = tr->buffer;

	unsigned long val;

	int ret;
@@ -4734,7 +4736,7 @@ static __init int tracer_init_debugfs(void) 
			  &trace_clock_fops);



	trace_create_file("tracing_on", 0644, d_tracer,

			    global_trace.buffer, &rb_simple_fops);

			    &global_trace, &rb_simple_fops);



#ifdef CONFIG_DYNAMIC_FTRACE

	trace_create_file("dyn_ftrace_total_info", 0444, d_tracer,

kernel/trace/trace.h

+2 −2
Original line number Diff line number Diff line
@@ -836,11 +836,11 @@ extern const char *__stop___trace_bprintk_fmt[]; 
		     filter)

#include "trace_entries.h"



#ifdef CONFIG_FUNCTION_TRACER

#if defined(CONFIG_PERF_EVENTS) && defined(CONFIG_FUNCTION_TRACER)

int perf_ftrace_event_register(struct ftrace_event_call *call,

			       enum trace_reg type, void *data);

#else

#define perf_ftrace_event_register NULL

#endif /* CONFIG_FUNCTION_TRACER */

#endif



#endif /* _LINUX_KERNEL_TRACE_H */

kernel/trace/trace_output.c

+5 −0
Original line number Diff line number Diff line
@@ -652,6 +652,8 @@ int trace_print_lat_context(struct trace_iterator *iter) 
{

	u64 next_ts;

	int ret;

	/* trace_find_next_entry will reset ent_size */

	int ent_size = iter->ent_size;

	struct trace_seq *s = &iter->seq;

	struct trace_entry *entry = iter->ent,

			   *next_entry = trace_find_next_entry(iter, NULL,
@@ -660,6 +662,9 @@ int trace_print_lat_context(struct trace_iterator *iter) 
	unsigned long abs_usecs = ns2usecs(iter->ts - iter->tr->time_start);

	unsigned long rel_usecs;



	/* Restore the original ent_size */

	iter->ent_size = ent_size;



	if (!next_entry)

		next_ts = iter->ts;

	rel_usecs = ns2usecs(next_ts - iter->ts);