Commit 606576ce authored by Steven Rostedt's avatar Steven Rostedt Committed by Ingo Molnar
Browse files

ftrace: rename FTRACE to FUNCTION_TRACER 



Due to confusion between the ftrace infrastructure and the gcc profiling
tracer "ftrace", this patch renames the config options from FTRACE to
FUNCTION_TRACER.  The other two names that are offspring from FTRACE
DYNAMIC_FTRACE and FTRACE_MCOUNT_RECORD will stay the same.

This patch was generated mostly by script, and partially by hand.

Signed-off-by: default avatarSteven Rostedt <srostedt@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent c2db8054

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ KBUILD_CFLAGS += -g 
KBUILD_AFLAGS	+= -gdwarf-2

endif



ifdef CONFIG_FTRACE

ifdef CONFIG_FUNCTION_TRACER

KBUILD_CFLAGS	+= -pg

endif

arch/arm/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ config ARM 
	select HAVE_ARCH_KGDB

	select HAVE_KPROBES if (!XIP_KERNEL)

	select HAVE_KRETPROBES if (HAVE_KPROBES)

	select HAVE_FTRACE if (!XIP_KERNEL)

	select HAVE_DYNAMIC_FTRACE if (HAVE_FTRACE)

	select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)

	select HAVE_DYNAMIC_FTRACE if (HAVE_FUNCTION_TRACER)

	select HAVE_GENERIC_DMA_COHERENT

	help

	  The ARM series is a line of low-power-consumption RISC chip designs

arch/arm/boot/compressed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ SEDFLAGS = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/ 
targets       := vmlinux vmlinux.lds piggy.gz piggy.o font.o font.c \

		 head.o misc.o $(OBJS)



ifeq ($(CONFIG_FTRACE),y)

ifeq ($(CONFIG_FUNCTION_TRACER),y)

ORIG_CFLAGS := $(KBUILD_CFLAGS)

KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))

endif

arch/arm/include/asm/ftrace.h

+1 −1
Original line number Diff line number Diff line 
#ifndef _ASM_ARM_FTRACE

#define _ASM_ARM_FTRACE



#ifdef CONFIG_FTRACE

#ifdef CONFIG_FUNCTION_TRACER

#define MCOUNT_ADDR		((long)(mcount))

#define MCOUNT_INSN_SIZE	4 /* sizeof mcount call */

arch/arm/kernel/armksyms.c

+1 −1
Original line number Diff line number Diff line
@@ -183,6 +183,6 @@ EXPORT_SYMBOL(_find_next_bit_be); 


EXPORT_SYMBOL(copy_page);



#ifdef CONFIG_FTRACE

#ifdef CONFIG_FUNCTION_TRACER

EXPORT_SYMBOL(mcount);

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE