From 96d8d4cbd338233cd25bb2ae6843bdbc383c1028 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Mon, 24 Aug 2009 22:48:27 +0900 Subject: [PATCH] --- yaml --- r: 163517 b: refs/heads/master c: f13327864f94c3a0e6acca923df537d20059639f h: refs/heads/master i: 163515: f013a5e46b915a2c6027ba69220d113e786d952b v: v3 --- [refs] | 2 +- trunk/arch/sh/include/asm/ftrace.h | 1 + trunk/arch/sh/kernel/ftrace.c | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index af0408425563..4ab2883c6f79 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 56fd1260a8de3738034588c6e32262960c5b2660 +refs/heads/master: f13327864f94c3a0e6acca923df537d20059639f diff --git a/trunk/arch/sh/include/asm/ftrace.h b/trunk/arch/sh/include/asm/ftrace.h index 7e0bcc4d4a96..3c2ede3690d7 100644 --- a/trunk/arch/sh/include/asm/ftrace.h +++ b/trunk/arch/sh/include/asm/ftrace.h @@ -4,6 +4,7 @@ #ifdef CONFIG_FUNCTION_TRACER #define MCOUNT_INSN_SIZE 4 /* sizeof mcount call */ +#define FTRACE_SYSCALL_MAX (NR_syscalls - 1) #ifndef __ASSEMBLY__ extern void mcount(void); diff --git a/trunk/arch/sh/kernel/ftrace.c b/trunk/arch/sh/kernel/ftrace.c index 6647dfcb781d..a3dcc6d5d253 100644 --- a/trunk/arch/sh/kernel/ftrace.c +++ b/trunk/arch/sh/kernel/ftrace.c @@ -283,8 +283,6 @@ static struct syscall_metadata *find_syscall_meta(unsigned long *syscall) return NULL; } -#define FTRACE_SYSCALL_MAX (NR_syscalls - 1) - struct syscall_metadata *syscall_nr_to_meta(int nr) { if (!syscalls_metadata || nr >= FTRACE_SYSCALL_MAX || nr < 0)