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

Commit 1fa41266 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 ebf31f50 d7b4d6de
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -210,7 +210,13 @@ endif

ifdef CONFIG_FTRACE_MCOUNT_RECORD
ifdef BUILD_C_RECORDMCOUNT
cmd_record_mcount = $(objtree)/scripts/recordmcount "$(@)";
# Due to recursion, we must skip empty.o.
# The empty.o file is created in the make process in order to determine
#  the target endianness and word size. It is made before all other C
#  files, including recordmcount.
cmd_record_mcount = if [ $(@) != "scripts/mod/empty.o" ]; then			\
			$(objtree)/scripts/recordmcount "$(@)";			\
		    fi;
else
cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \
	"$(if $(CONFIG_CPU_BIG_ENDIAN),big,little)" \