Commit-ID: e4ea3f6b1bf3d489674a3660db652636e50186f9
Gitweb: http://git.kernel.org/tip/e4ea3f6b1bf3d489674a3660db652636e50186f9
Author: Uros Bizjak <[email protected]>
AuthorDate: Thu, 19 Jul 2012 13:04:47 -0400
Committer: Steven Rostedt <[email protected]>
CommitDate: Tue, 31 Jul 2012 10:29:34 -0400
ftrace/x86_32: Simplify parameter setup for ftrace_regs_caller
The final position of the stack after saving regs and setting up
the parameters for ftrace_regs_call, is the position of the pt_regs
needed for the 4th parameter. Instead of saving it into a temporary
reg and pushing the reg, simply push the stack pointer.
Link: http://lkml.kernel.org/r/[email protected]
Reviewed-by: Masami Hiramatsu <[email protected]>
Signed-off-by: Uros Bizjak <[email protected]>
Signed-off-by: Steven Rostedt <[email protected]>
---
arch/x86/kernel/entry_32.S | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index 46caa56..4dc3017 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -1169,10 +1169,9 @@ ENTRY(ftrace_regs_caller)
movl $__KERNEL_CS,13*4(%esp)
movl 12*4(%esp), %eax /* Load ip (1st parameter) */
- movl 0x4(%ebp), %edx /* Load parent ip (2cd parameter) */
- lea (%esp), %ecx
- pushl %ecx /* Save pt_regs as 4th parameter */
+ movl 0x4(%ebp), %edx /* Load parent ip (2nd parameter) */
leal function_trace_op, %ecx /* Save ftrace_pos in 3rd parameter */
+ pushl %esp /* Save pt_regs as 4th parameter */
GLOBAL(ftrace_regs_call)
call ftrace_stub