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: Fengguang Wu <fengguang.wu@intel.com>
Tested-by: Fengguang Wu <fengguang.wu@intel.com>
Fixes: 6a06bdbf7f9c "ftrace/fgraph/x86: Have prepare_ftrace_return() take ip as first parameter"
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index b553ed89e5f5..df3e608d409b 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -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