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

Commit 28fb5dfa authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt
Browse files

ftrace/x86_32: Push ftrace_ops in as 3rd parameter to function tracer 

Add support of passing the current ftrace_ops into the 3rd parameter
of the callback to the function tracer.

Link: http://lkml.kernel.org/r/20120612225424.942411318@goodmis.org



Reviewed-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent a1e2e31d

arch/x86/include/asm/ftrace.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#define MCOUNT_ADDR		((long)(mcount))

#define MCOUNT_INSN_SIZE	5 /* sizeof mcount call */



#if defined(CONFIG_DYNAMIC_FTRACE) && defined(CONFIG_X86_64)

#ifdef CONFIG_DYNAMIC_FTRACE

#define ARCH_SUPPORTS_FTRACE_OPS 1

#endif

arch/x86/kernel/entry_32.S

+1 −0
Original line number Diff line number Diff line
@@ -1111,6 +1111,7 @@ ENTRY(ftrace_caller) 
	pushl %edx

	movl 0xc(%esp), %eax

	movl 0x4(%ebp), %edx

	leal function_trace_op, %ecx

	subl $MCOUNT_INSN_SIZE, %eax



.globl ftrace_call