Commit 0fdf1360 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tip/perf/recordmcount-2' of... 

Merge branch 'tip/perf/recordmcount-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
parents d9d572a9 cf4db259

Makefile

+6 −0
Original line number Diff line number Diff line
@@ -568,6 +568,12 @@ endif 


ifdef CONFIG_FUNCTION_TRACER

KBUILD_CFLAGS	+= -pg

ifdef CONFIG_DYNAMIC_FTRACE

	ifdef CONFIG_HAVE_C_RECORDMCOUNT

		BUILD_C_RECORDMCOUNT := y

		export BUILD_C_RECORDMCOUNT

	endif

endif

endif



# We trigger additional mismatches with less inlining

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ config X86 
	select HAVE_KRETPROBES

	select HAVE_OPTPROBES

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_C_RECORDMCOUNT

	select HAVE_DYNAMIC_FTRACE

	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_GRAPH_TRACER

kernel/trace/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -49,6 +49,11 @@ config HAVE_SYSCALL_TRACEPOINTS 
	help

	  See Documentation/trace/ftrace-design.txt



config HAVE_C_RECORDMCOUNT

	bool

	help

	  C version of recordmcount available?



config TRACER_MAX_TRACE

	bool

scripts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ hostprogs-$(CONFIG_KALLSYMS) += kallsyms 
hostprogs-$(CONFIG_LOGO)         += pnmtologo

hostprogs-$(CONFIG_VT)           += conmakehash

hostprogs-$(CONFIG_IKCONFIG)     += bin2c

hostprogs-$(BUILD_C_RECORDMCOUNT) += recordmcount



always		:= $(hostprogs-y) $(hostprogs-m)

scripts/Makefile.build

+4 −0
Original line number Diff line number Diff line
@@ -209,12 +209,16 @@ cmd_modversions = \ 
endif



ifdef CONFIG_FTRACE_MCOUNT_RECORD

ifdef BUILD_C_RECORDMCOUNT

cmd_record_mcount = $(srctree)/scripts/recordmcount "$(@)";

else

cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \

	"$(if $(CONFIG_CPU_BIG_ENDIAN),big,little)" \

	"$(if $(CONFIG_64BIT),64,32)" \

	"$(OBJDUMP)" "$(OBJCOPY)" "$(CC)" "$(LD)" "$(NM)" "$(RM)" "$(MV)" \

	"$(if $(part-of-module),1,0)" "$(@)";

endif

endif



define rule_cc_o_c

	$(call echo-cmd,checksrc) $(cmd_checksrc)			  \