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/sparc | |
| 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/sparc')
| -rw-r--r-- | arch/sparc/include/asm/syscall.h | 7 | ||||
| -rw-r--r-- | arch/sparc/kernel/ftrace.c | 11 |
2 files changed, 7 insertions, 11 deletions
diff --git a/arch/sparc/include/asm/syscall.h b/arch/sparc/include/asm/syscall.h index 7486c60..025a02a 100644 --- a/arch/sparc/include/asm/syscall.h +++ b/arch/sparc/include/asm/syscall.h @@ -5,6 +5,13 @@ #include <linux/sched.h> #include <asm/ptrace.h> +/* + * The syscall table always contains 32 bit pointers since we know that the + * address of the function to be called is (way) below 4GB. So the "int" + * type here is what we want [need] for both 32 bit and 64 bit systems. + */ +extern const unsigned int sys_call_table[]; + /* The system call number is given by the user in %g1 */ static inline long syscall_get_nr(struct task_struct *task, struct pt_regs *regs) diff --git a/arch/sparc/kernel/ftrace.c b/arch/sparc/kernel/ftrace.c index 29973da..9103a56 100644 --- a/arch/sparc/kernel/ftrace.c +++ b/arch/sparc/kernel/ftrace.c @@ -91,14 +91,3 @@ int __init ftrace_dyn_arch_init(void *data) return 0; } #endif - -#ifdef CONFIG_FTRACE_SYSCALLS - -extern unsigned int sys_call_table[]; - -unsigned long __init arch_syscall_addr(int nr) -{ - return (unsigned long)sys_call_table[nr]; -} - -#endif |