lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sh: FTRACE renamed to FUNCTION_TRACER.

Browse Source 
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt
2008-10-31 16:20:36 +09:00
parent 0803d540db
commit 694f94f263
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sh/Kconfig
View File

@@ -24,7 +24,7 @@ config SUPERH32
select HAVE_KPROBES select HAVE_KPROBES
select HAVE_KRETPROBES select HAVE_KRETPROBES
select HAVE_ARCH_TRACEHOOK select HAVE_ARCH_TRACEHOOK
select HAVE_FTRACE select HAVE_FUNCTION_TRACER
config SUPERH64 config SUPERH64
def_bool y if CPU_SH5 def_bool y if CPU_SH5

2
arch/sh/boot/compressed/Makefile_32
View File

@@ -23,7 +23,7 @@ IMAGE_OFFSET := $(shell /bin/bash -c 'printf "0x%08x" \
LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name) LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
ifeq ($(CONFIG_FTRACE),y) ifeq ($(CONFIG_FUNCTION_TRACER),y)
ORIG_CFLAGS := $(KBUILD_CFLAGS) ORIG_CFLAGS := $(KBUILD_CFLAGS)
KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS)) KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))
endif endif

4
arch/sh/kernel/entry-common.S
View File

@@ -372,7 +372,7 @@ syscall_exit:
7: .long do_syscall_trace_enter 7: .long do_syscall_trace_enter
8: .long do_syscall_trace_leave 8: .long do_syscall_trace_leave
#ifdef CONFIG_FTRACE #ifdef CONFIG_FUNCTION_TRACER
.align 2 .align 2
.globl _mcount .globl _mcount
.type _mcount,@function .type _mcount,@function
@@ -414,4 +414,4 @@ skip_trace:
ftrace_stub: ftrace_stub:
rts rts
nop nop
#endif /* CONFIG_FTRACE */ #endif /* CONFIG_FUNCTION_TRACER */

2
arch/sh/kernel/sh_ksyms_32.c
View File

@@ -134,7 +134,7 @@ EXPORT_SYMBOL(flush_dcache_page);
EXPORT_SYMBOL(clear_user_page); EXPORT_SYMBOL(clear_user_page);
#endif #endif
#ifdef CONFIG_FTRACE #ifdef CONFIG_FUNCTION_TRACER
EXPORT_SYMBOL(mcount); EXPORT_SYMBOL(mcount);
#endif #endif
EXPORT_SYMBOL(csum_partial); EXPORT_SYMBOL(csum_partial);