diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-02-27 04:06:10 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-02-27 04:06:10 -0500 |
commit | 6fb83029db161141d68cf019760a893d03d0682b (patch) | |
tree | 6f149c23cedc9b2a5f72b5b90ab8426b39afbb7c /arch/x86/kernel/ftrace.c | |
parent | 281b3714e91162b66add1cfac404cf7b81e3e2f2 (diff) | |
parent | e01292b1fd68ff2abe234d584b06e64344d2c1de (diff) |
Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into tracing/core
Diffstat (limited to 'arch/x86/kernel/ftrace.c')
-rw-r--r-- | arch/x86/kernel/ftrace.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index 605ef196fdd6..cd37469b54ee 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c | |||
@@ -510,13 +510,3 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr, | |||
510 | } | 510 | } |
511 | } | 511 | } |
512 | #endif /* CONFIG_FUNCTION_GRAPH_TRACER */ | 512 | #endif /* CONFIG_FUNCTION_GRAPH_TRACER */ |
513 | |||
514 | #ifdef CONFIG_FTRACE_SYSCALLS | ||
515 | |||
516 | extern unsigned long *sys_call_table; | ||
517 | |||
518 | unsigned long __init arch_syscall_addr(int nr) | ||
519 | { | ||
520 | return (unsigned long)(&sys_call_table)[nr]; | ||
521 | } | ||
522 | #endif | ||