diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2011-08-08 20:57:47 (GMT) |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-07-19 17:17:35 (GMT) |
| commit | 2f5f6ad9390c1ebbf738d130dbfe80b60eaa167e (patch) | |
| tree | 1a88c37725d3efbcde8fa0a3cf19490d793877f0 /arch | |
| parent | 6e0f17be0361444862637e8986c8c1a3b3f8dcf8 (diff) | |
| download | linux-fsl-qoriq-2f5f6ad9390c1ebbf738d130dbfe80b60eaa167e.tar.xz | |
ftrace: Pass ftrace_ops as third parameter to function trace callback
Currently the function trace callback receives only the ip and parent_ip
of the function that it traced. It would be more powerful to also return
the ops that registered the function as well. This allows the same function
to act differently depending on what ftrace_ops registered it.
Link: http://lkml.kernel.org/r/20120612225424.267254552@goodmis.org
Reviewed-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/include/asm/ftrace.h | 4 | ||||
| -rw-r--r-- | arch/x86/kernel/entry_64.S | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/include/asm/ftrace.h b/arch/x86/include/asm/ftrace.h index b0767bc..783b107 100644 --- a/arch/x86/include/asm/ftrace.h +++ b/arch/x86/include/asm/ftrace.h @@ -32,6 +32,10 @@ #define MCOUNT_ADDR ((long)(mcount)) #define MCOUNT_INSN_SIZE 5 /* sizeof mcount call */ +#if defined(CONFIG_DYNAMIC_FTRACE) && defined(CONFIG_X86_64) +#define ARCH_SUPPORTS_FTRACE_OPS 1 +#endif + #ifndef __ASSEMBLY__ extern void mcount(void); extern atomic_t modifying_ftrace_code; diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 7d65133..2b4f94c 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -79,6 +79,7 @@ ENTRY(ftrace_caller) MCOUNT_SAVE_FRAME + leaq function_trace_op, %rdx movq 0x38(%rsp), %rdi movq 8(%rbp), %rsi subq $MCOUNT_INSN_SIZE, %rdi |