aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-02-27 04:06:10 -0500
committerIngo Molnar <mingo@elte.hu>2010-02-27 04:06:10 -0500
commit6fb83029db161141d68cf019760a893d03d0682b (patch)
tree6f149c23cedc9b2a5f72b5b90ab8426b39afbb7c /arch/sh/kernel
parent281b3714e91162b66add1cfac404cf7b81e3e2f2 (diff)
parente01292b1fd68ff2abe234d584b06e64344d2c1de (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/sh/kernel')
-rw-r--r--arch/sh/kernel/ftrace.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/sh/kernel/ftrace.c b/arch/sh/kernel/ftrace.c
index a48cdedc73b5..30e13196d35b 100644
--- a/arch/sh/kernel/ftrace.c
+++ b/arch/sh/kernel/ftrace.c
@@ -399,12 +399,3 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
399 } 399 }
400} 400}
401#endif /* CONFIG_FUNCTION_GRAPH_TRACER */ 401#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
402
403#ifdef CONFIG_FTRACE_SYSCALLS
404extern unsigned long *sys_call_table;
405
406unsigned long __init arch_syscall_addr(int nr)
407{
408 return (unsigned long)sys_call_table[nr];
409}
410#endif /* CONFIG_FTRACE_SYSCALLS */