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

Commit 0087aabd authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tip/tracing/core' of... 

Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
parents cc0104e8 cc51a0fc

include/linux/kernel.h

+2 −0
Original line number Diff line number Diff line
@@ -492,6 +492,8 @@ extern int 
__trace_printk(unsigned long ip, const char *fmt, ...)

	__attribute__ ((format (printf, 2, 3)));



extern void trace_dump_stack(void);



/*

 * The double __builtin_constant_p is because gcc will give us an error

 * if we try to allocate the static variable to fmt if it is not a

kernel/trace/trace.c

+16 −0
Original line number Diff line number Diff line
@@ -1150,6 +1150,22 @@ void __trace_stack(struct trace_array *tr, unsigned long flags, int skip, 
	__ftrace_trace_stack(tr->buffer, flags, skip, pc);

}



/**

 * trace_dump_stack - record a stack back trace in the trace buffer

 */

void trace_dump_stack(void)

{

	unsigned long flags;



	if (tracing_disabled || tracing_selftest_running)

		return 0;



	local_save_flags(flags);



	/* skipping 3 traces, seems to get us at the caller of this function */

	__ftrace_trace_stack(global_trace.buffer, flags, 3, preempt_count());

}



void

ftrace_trace_userstack(struct ring_buffer *buffer, unsigned long flags, int pc)

{

kernel/trace/trace_irqsoff.c

+2 −0
Original line number Diff line number Diff line
@@ -151,6 +151,8 @@ check_critical_timing(struct trace_array *tr, 
		goto out_unlock;



	trace_function(tr, CALLER_ADDR0, parent_ip, flags, pc);

	/* Skip 5 functions to get to the irq/preempt enable function */

	__trace_stack(tr, flags, 5, pc);



	if (data->critical_sequence != max_sequence)

		goto out_unlock;