Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 694f94f2 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: FTRACE renamed to FUNCTION_TRACER. 



Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 0803d540

arch/sh/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/sh/boot/compressed/Makefile_32

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/sh/kernel/entry-common.S

+2 −2
Original line number Diff line number Diff line
@@ -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 */

arch/sh/kernel/sh_ksyms_32.c

+1 −1
Original line number Diff line number Diff line
@@ -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);