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

Commit f823b37b authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt
Browse files

ftrace/x86: Update i386 call to prepare_ftrace_return() 

The parameters for prepare_ftrace_return() used by the function graph
tracer were swapped to simplify the code on x86_64. But i386 function
graph trampoline also calls this function, and it did not have its
parameters swapped.

Link: http://lkml.kernel.org/r/20141210231732.GA24163@wfg-t540p.sh.intel.com



Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Tested-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Fixes: 6a06bdbf "ftrace/fgraph/x86: Have prepare_ftrace_return() take ip as first parameter"
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 3558a5ac

arch/x86/kernel/entry_32.S

+3 −3
Original line number Diff line number Diff line
@@ -1192,10 +1192,10 @@ ENTRY(ftrace_graph_caller) 
	pushl %eax

	pushl %ecx

	pushl %edx

	movl 0xc(%esp), %edx

	lea 0x4(%ebp), %eax

	movl 0xc(%esp), %eax

	lea 0x4(%ebp), %edx

	movl (%ebp), %ecx

	subl $MCOUNT_INSN_SIZE, %edx

	subl $MCOUNT_INSN_SIZE, %eax

	call prepare_ftrace_return

	popl %edx

	popl %ecx