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

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

Merge branch 'tip/tracing/urgent-1' of... 

Merge branch 'tip/tracing/urgent-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
parents 3daeb4da 71e308a2

arch/powerpc/kernel/ftrace.c

+1 −1
Original line number Diff line number Diff line
@@ -605,7 +605,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) 
		return;

	}



	if (ftrace_push_return_trace(old, self_addr, &trace.depth) == -EBUSY) {

	if (ftrace_push_return_trace(old, self_addr, &trace.depth, 0) == -EBUSY) {

		*parent = old;

		return;

	}

arch/s390/kernel/ftrace.c

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ unsigned long prepare_ftrace_return(unsigned long ip, unsigned long parent) 
		goto out;

	if (unlikely(atomic_read(&current->tracing_graph_pause)))

		goto out;

	if (ftrace_push_return_trace(parent, ip, &trace.depth) == -EBUSY)

	if (ftrace_push_return_trace(parent, ip, &trace.depth, 0) == -EBUSY)

		goto out;

	trace.func = ftrace_mcount_call_adjust(ip) & PSW_ADDR_INSN;

	/* Only trace if the calling function expects to. */

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ config X86 
	select HAVE_DYNAMIC_FTRACE

	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_GRAPH_FP_TEST

	select HAVE_FUNCTION_TRACE_MCOUNT_TEST

	select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE

	select HAVE_FTRACE_SYSCALLS

arch/x86/kernel/entry_32.S

+2 −0
Original line number Diff line number Diff line
@@ -1154,6 +1154,7 @@ ENTRY(ftrace_graph_caller) 
	pushl %edx

	movl 0xc(%esp), %edx

	lea 0x4(%ebp), %eax

	movl (%ebp), %ecx

	subl $MCOUNT_INSN_SIZE, %edx

	call prepare_ftrace_return

	popl %edx
@@ -1168,6 +1169,7 @@ return_to_handler: 
	pushl %eax

	pushl %ecx

	pushl %edx

	movl %ebp, %eax

	call ftrace_return_to_handler

	movl %eax, 0xc(%esp)

	popl %edx

arch/x86/kernel/entry_64.S

+2 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ ENTRY(ftrace_graph_caller) 


	leaq 8(%rbp), %rdi

	movq 0x38(%rsp), %rsi

	movq (%rbp), %rdx

	subq $MCOUNT_INSN_SIZE, %rsi



	call	prepare_ftrace_return
@@ -150,6 +151,7 @@ GLOBAL(return_to_handler) 
	/* Save the return values */

	movq %rax, (%rsp)

	movq %rdx, 8(%rsp)

	movq %rbp, %rdi



	call ftrace_return_to_handler