summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/entry_32.S
diff options
context:
space:
mode:
authorSteven Rostedt2011-08-11 04:00:55 +0200
committerSteven Rostedt2012-07-19 19:19:27 +0200
commit28fb5dfa783c25dbeeb25a72663f8066a3a517f5 (patch)
tree3628de1a477cea068c2bec91c7cebc5ae0adda33 /arch/x86/kernel/entry_32.S
parentftrace: Return pt_regs to function trace callback (diff)
downloadkernel-qcow2-linux-28fb5dfa783c25dbeeb25a72663f8066a3a517f5.tar.gz
kernel-qcow2-linux-28fb5dfa783c25dbeeb25a72663f8066a3a517f5.tar.xz
kernel-qcow2-linux-28fb5dfa783c25dbeeb25a72663f8066a3a517f5.zip
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: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'arch/x86/kernel/entry_32.S')
-rw-r--r--arch/x86/kernel/entry_32.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index 623f28837476..e3e17a0b7ff8 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -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