Merge branch 'tip/perf/core-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
This commit is contained in:
Коммит
398995ce79
|
@ -255,6 +255,8 @@ sub_cmd_record_mcount = \
|
||||||
if [ $(@) != "scripts/mod/empty.o" ]; then \
|
if [ $(@) != "scripts/mod/empty.o" ]; then \
|
||||||
$(objtree)/scripts/recordmcount $(RECORDMCOUNT_FLAGS) "$(@)"; \
|
$(objtree)/scripts/recordmcount $(RECORDMCOUNT_FLAGS) "$(@)"; \
|
||||||
fi;
|
fi;
|
||||||
|
recordmcount_source := $(srctree)/scripts/recordmcount.c \
|
||||||
|
$(srctree)/scripts/recordmcount.h
|
||||||
else
|
else
|
||||||
sub_cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \
|
sub_cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \
|
||||||
"$(if $(CONFIG_CPU_BIG_ENDIAN),big,little)" \
|
"$(if $(CONFIG_CPU_BIG_ENDIAN),big,little)" \
|
||||||
|
@ -262,6 +264,7 @@ sub_cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH
|
||||||
"$(OBJDUMP)" "$(OBJCOPY)" "$(CC) $(KBUILD_CFLAGS)" \
|
"$(OBJDUMP)" "$(OBJCOPY)" "$(CC) $(KBUILD_CFLAGS)" \
|
||||||
"$(LD)" "$(NM)" "$(RM)" "$(MV)" \
|
"$(LD)" "$(NM)" "$(RM)" "$(MV)" \
|
||||||
"$(if $(part-of-module),1,0)" "$(@)";
|
"$(if $(part-of-module),1,0)" "$(@)";
|
||||||
|
recordmcount_source := $(srctree)/scripts/recordmcount.pl
|
||||||
endif
|
endif
|
||||||
cmd_record_mcount = \
|
cmd_record_mcount = \
|
||||||
if [ "$(findstring -pg,$(_c_flags))" = "-pg" ]; then \
|
if [ "$(findstring -pg,$(_c_flags))" = "-pg" ]; then \
|
||||||
|
@ -282,13 +285,13 @@ define rule_cc_o_c
|
||||||
endef
|
endef
|
||||||
|
|
||||||
# Built-in and composite module parts
|
# Built-in and composite module parts
|
||||||
$(obj)/%.o: $(src)/%.c FORCE
|
$(obj)/%.o: $(src)/%.c $(recordmcount_source) FORCE
|
||||||
$(call cmd,force_checksrc)
|
$(call cmd,force_checksrc)
|
||||||
$(call if_changed_rule,cc_o_c)
|
$(call if_changed_rule,cc_o_c)
|
||||||
|
|
||||||
# Single-part modules are special since we need to mark them in $(MODVERDIR)
|
# Single-part modules are special since we need to mark them in $(MODVERDIR)
|
||||||
|
|
||||||
$(single-used-m): $(obj)/%.o: $(src)/%.c FORCE
|
$(single-used-m): $(obj)/%.o: $(src)/%.c $(recordmcount_source) FORCE
|
||||||
$(call cmd,force_checksrc)
|
$(call cmd,force_checksrc)
|
||||||
$(call if_changed_rule,cc_o_c)
|
$(call if_changed_rule,cc_o_c)
|
||||||
@{ echo $(@:.o=.ko); echo $@; } > $(MODVERDIR)/$(@F:.o=.mod)
|
@{ echo $(@:.o=.ko); echo $@; } > $(MODVERDIR)/$(@F:.o=.mod)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче