diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-05-07 11:03:52 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-05-07 11:03:52 +0200 |
| commit | 19631cb3d67c24c8b1fa58bc69bc2fed8d15095d (patch) | |
| tree | a56d9e11f23e3433f9eaa5b3f9dec7bef378c37e /arch/x86/include | |
| parent | 1fa2e84db3f95adab8d9c2aa245e9a0ebf32248a (diff) | |
| parent | 59a094c994a138049b41a44bc29cff9407d51c5b (diff) | |
Merge branch 'tip/perf/core-4' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/ftrace.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/include/asm/ftrace.h b/arch/x86/include/asm/ftrace.h index 268c783ab1c..18d9005d9e4 100644 --- a/arch/x86/include/asm/ftrace.h +++ b/arch/x86/include/asm/ftrace.h @@ -34,6 +34,7 @@ #ifndef __ASSEMBLY__ extern void mcount(void); +extern int modifying_ftrace_code; static inline unsigned long ftrace_call_adjust(unsigned long addr) { @@ -50,6 +51,8 @@ struct dyn_arch_ftrace { /* No extra data needed for x86 */ }; +int ftrace_int3_handler(struct pt_regs *regs); + #endif /* CONFIG_DYNAMIC_FTRACE */ #endif /* __ASSEMBLY__ */ #endif /* CONFIG_FUNCTION_TRACER */ |