diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2008-10-31 08:20:36 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-31 08:20:36 +0100 |
| commit | 694f94f263bee30ada18bab178b98a0d10917e68 (patch) | |
| tree | 3f5a210a77dba2c138db918bbff52e65b172f2a3 /arch/sh/kernel/entry-common.S | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds... (diff) | |
| download | linux-694f94f263bee30ada18bab178b98a0d10917e68.tar.xz linux-694f94f263bee30ada18bab178b98a0d10917e68.zip | |
sh: FTRACE renamed to FUNCTION_TRACER.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/entry-common.S')
| -rw-r--r-- | arch/sh/kernel/entry-common.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S index 1a5cf9dd82de..5b7efc4016fa 100644 --- a/arch/sh/kernel/entry-common.S +++ b/arch/sh/kernel/entry-common.S @@ -372,7 +372,7 @@ syscall_exit: 7: .long do_syscall_trace_enter 8: .long do_syscall_trace_leave -#ifdef CONFIG_FTRACE +#ifdef CONFIG_FUNCTION_TRACER .align 2 .globl _mcount .type _mcount,@function @@ -414,4 +414,4 @@ skip_trace: ftrace_stub: rts nop -#endif /* CONFIG_FTRACE */ +#endif /* CONFIG_FUNCTION_TRACER */ |