diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-02-23 10:47:23 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-02-23 10:47:23 +1100 |
| commit | 35f88e6b06d024ed25e8ed5420c5c8844b54e1a1 (patch) | |
| tree | 6c96ec07cc6dc47399d82f82d4cb830c2a1cb2af /arch/x86/include | |
| parent | 3b7faeb49e7c35db857b595c389436994ab1275e (diff) | |
| parent | 712406a6bf59ebf4a00358bb59a4a2a1b2953d90 (diff) | |
| download | kernel_samsung_espresso10-35f88e6b06d024ed25e8ed5420c5c8844b54e1a1.zip kernel_samsung_espresso10-35f88e6b06d024ed25e8ed5420c5c8844b54e1a1.tar.gz kernel_samsung_espresso10-35f88e6b06d024ed25e8ed5420c5c8844b54e1a1.tar.bz2 | |
Merge commit 'ftrace/function-graph' into next
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 */ |