diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-02-27 10:06:10 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-02-27 10:06:10 +0100 |
| commit | 6fb83029db161141d68cf019760a893d03d0682b (patch) | |
| tree | 6f149c23cedc9b2a5f72b5b90ab8426b39afbb7c /arch/sh | |
| parent | 281b3714e91162b66add1cfac404cf7b81e3e2f2 (diff) | |
| parent | e01292b1fd68ff2abe234d584b06e64344d2c1de (diff) | |
| download | kernel_goldelico_gta04-6fb83029db161141d68cf019760a893d03d0682b.zip kernel_goldelico_gta04-6fb83029db161141d68cf019760a893d03d0682b.tar.gz kernel_goldelico_gta04-6fb83029db161141d68cf019760a893d03d0682b.tar.bz2 | |
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')
| -rw-r--r-- | arch/sh/include/asm/syscall.h | 2 | ||||
| -rw-r--r-- | arch/sh/kernel/ftrace.c | 9 |
2 files changed, 2 insertions, 9 deletions
diff --git a/arch/sh/include/asm/syscall.h b/arch/sh/include/asm/syscall.h index 6a38142..aa7777b 100644 --- a/arch/sh/include/asm/syscall.h +++ b/arch/sh/include/asm/syscall.h @@ -1,6 +1,8 @@ #ifndef __ASM_SH_SYSCALL_H #define __ASM_SH_SYSCALL_H +extern const unsigned long sys_call_table[]; + #ifdef CONFIG_SUPERH32 # include "syscall_32.h" #else diff --git a/arch/sh/kernel/ftrace.c b/arch/sh/kernel/ftrace.c index a48cded..30e1319 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) } } #endif /* CONFIG_FUNCTION_GRAPH_TRACER */ - -#ifdef CONFIG_FTRACE_SYSCALLS -extern unsigned long *sys_call_table; - -unsigned long __init arch_syscall_addr(int nr) -{ - return (unsigned long)sys_call_table[nr]; -} -#endif /* CONFIG_FTRACE_SYSCALLS */ |