diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-19 12:13:33 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-19 12:13:33 +0100 |
| commit | 4cd0332db7e8f57cc082bab11d82c064a9721737 (patch) | |
| tree | b6de7771d67c5bf6eeb890fa0f5a901365104b98 /arch/x86/include | |
| parent | 40999096e8b9872199bf56ecd0c4d98397ccaf2f (diff) | |
| parent | 712406a6bf59ebf4a00358bb59a4a2a1b2953d90 (diff) | |
| download | kernel_samsung_smdk4412-4cd0332db7e8f57cc082bab11d82c064a9721737.zip kernel_samsung_smdk4412-4cd0332db7e8f57cc082bab11d82c064a9721737.tar.gz kernel_samsung_smdk4412-4cd0332db7e8f57cc082bab11d82c064a9721737.tar.bz2 | |
Merge branch 'mainline/function-graph' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/function-graph-tracer
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/ftrace.h | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/arch/x86/include/asm/ftrace.h b/arch/x86/include/asm/ftrace.h index b55b4a7..db24c22 100644 --- a/arch/x86/include/asm/ftrace.h +++ b/arch/x86/include/asm/ftrace.h @@ -55,29 +55,4 @@ struct dyn_arch_ftrace { #endif /* __ASSEMBLY__ */ #endif /* CONFIG_FUNCTION_TRACER */ -#ifdef CONFIG_FUNCTION_GRAPH_TRACER - -#ifndef __ASSEMBLY__ - -/* - * Stack of return addresses for functions - * of a thread. - * Used in struct thread_info - */ -struct ftrace_ret_stack { - unsigned long ret; - unsigned long func; - unsigned long long calltime; -}; - -/* - * Primary handler of a function return. - * It relays on ftrace_return_to_handler. - * Defined in entry_32/64.S - */ -extern void return_to_handler(void); - -#endif /* __ASSEMBLY__ */ -#endif /* CONFIG_FUNCTION_GRAPH_TRACER */ - #endif /* _ASM_X86_FTRACE_H */ |