diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-08-24 09:48:27 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-24 09:48:27 -0400 |
commit | f13327864f94c3a0e6acca923df537d20059639f (patch) | |
tree | f1df9a1c198592de4c63bf5f80319c6526e0582c /arch/sh | |
parent | 56fd1260a8de3738034588c6e32262960c5b2660 (diff) |
sh: Move the FTRACE_SYSCALL_MAX definition in to asm/ftrace.h.
Needed by ftrace changes in -tip.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/include/asm/ftrace.h | 1 | ||||
-rw-r--r-- | arch/sh/kernel/ftrace.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/sh/include/asm/ftrace.h b/arch/sh/include/asm/ftrace.h index 7e0bcc4d4a96..3c2ede3690d7 100644 --- a/arch/sh/include/asm/ftrace.h +++ b/arch/sh/include/asm/ftrace.h | |||
@@ -4,6 +4,7 @@ | |||
4 | #ifdef CONFIG_FUNCTION_TRACER | 4 | #ifdef CONFIG_FUNCTION_TRACER |
5 | 5 | ||
6 | #define MCOUNT_INSN_SIZE 4 /* sizeof mcount call */ | 6 | #define MCOUNT_INSN_SIZE 4 /* sizeof mcount call */ |
7 | #define FTRACE_SYSCALL_MAX (NR_syscalls - 1) | ||
7 | 8 | ||
8 | #ifndef __ASSEMBLY__ | 9 | #ifndef __ASSEMBLY__ |
9 | extern void mcount(void); | 10 | extern void mcount(void); |
diff --git a/arch/sh/kernel/ftrace.c b/arch/sh/kernel/ftrace.c index 6647dfcb781d..a3dcc6d5d253 100644 --- a/arch/sh/kernel/ftrace.c +++ b/arch/sh/kernel/ftrace.c | |||
@@ -283,8 +283,6 @@ static struct syscall_metadata *find_syscall_meta(unsigned long *syscall) | |||
283 | return NULL; | 283 | return NULL; |
284 | } | 284 | } |
285 | 285 | ||
286 | #define FTRACE_SYSCALL_MAX (NR_syscalls - 1) | ||
287 | |||
288 | struct syscall_metadata *syscall_nr_to_meta(int nr) | 286 | struct syscall_metadata *syscall_nr_to_meta(int nr) |
289 | { | 287 | { |
290 | if (!syscalls_metadata || nr >= FTRACE_SYSCALL_MAX || nr < 0) | 288 | if (!syscalls_metadata || nr >= FTRACE_SYSCALL_MAX || nr < 0) |