소스 검색

sh: FTRACE renamed to FUNCTION_TRACER.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Paul Mundt 16 년 전
부모
커밋
694f94f263
4개의 변경된 파일5개의 추가작업 그리고 5개의 파일을 삭제
  1. 1 1
      arch/sh/Kconfig
  2. 1 1
      arch/sh/boot/compressed/Makefile_32
  3. 2 2
      arch/sh/kernel/entry-common.S
  4. 1 1
      arch/sh/kernel/sh_ksyms_32.c

+ 1 - 1
arch/sh/Kconfig

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

+ 1 - 1
arch/sh/boot/compressed/Makefile_32

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

+ 2 - 2
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 */

+ 1 - 1
arch/sh/kernel/sh_ksyms_32.c

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