[GIT PULL] (missing patch) ftrace/kbuild: Add recordmcount files to force full build

[GIT PULL] (missing patch) ftrace/kbuild: Add recordmcount files to force full build

[Steven Rostedt]

Ingo,

This is the missing patch that was suppose to be in tip/perf/core-2 but
was missing due to git mirror lag.

I waited till the git mirrors updated this time.

Please pull the latest tip/perf/core-3 tree, which can be found at:

  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/perf/core-3


Michal Marek (1):
      ftrace/kbuild: Add recordmcount files to force full build

----
 scripts/Makefile.build |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---------------------------
commit d6971822c288ce5547190c6f812cc978d6520777
Author: Michal Marek <mmarek@suse.cz>
Date:   Tue May 17 15:36:46 2011 +0200

    ftrace/kbuild: Add recordmcount files to force full build
    
    Modifications to recordmcount must be performed on all object
    files to stay consistent with what the kernel code may expect.
    Add the recordmcount files to the main dependencies to make sure
    any change to them causes a full recompile.
    
    Signed-off-by: Michal Marek <mmarek@suse.cz>
    Link: http://lkml.kernel.org/r/20110517133646.GP13293@sepie.suse.cz
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index fdca952..6165622 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -255,6 +255,8 @@ sub_cmd_record_mcount =					\
 	if [ $(@) != "scripts/mod/empty.o" ]; then	\
 		$(objtree)/scripts/recordmcount $(RECORDMCOUNT_FLAGS) "$(@)";	\
 	fi;
+recordmcount_source := $(srctree)/scripts/recordmcount.c \
+		    $(srctree)/scripts/recordmcount.h
 else
 sub_cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \
 	"$(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)" \
 	"$(LD)" "$(NM)" "$(RM)" "$(MV)" \
 	"$(if $(part-of-module),1,0)" "$(@)";
+recordmcount_source := $(srctree)/scripts/recordmcount.pl
 endif
 cmd_record_mcount = 						\
 	if [ "$(findstring -pg,$(_c_flags))" = "-pg" ]; then	\
@@ -282,13 +285,13 @@ define rule_cc_o_c
 endef
 
 # Built-in and composite module parts
-$(obj)/%.o: $(src)/%.c FORCE
+$(obj)/%.o: $(src)/%.c $(recordmcount_source) FORCE
 	$(call cmd,force_checksrc)
 	$(call if_changed_rule,cc_o_c)
 
 # 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 if_changed_rule,cc_o_c)
 	@{ echo $(@:.o=.ko); echo $@; } > $(MODVERDIR)/$(@F:.o=.mod)

Re: [GIT PULL] (missing patch) ftrace/kbuild: Add recordmcount files to force full build

[Ingo Molnar]

* Steven Rostedt <rostedt@goodmis.org> wrote:

> 
> Ingo,
> 
> This is the missing patch that was suppose to be in tip/perf/core-2 but
> was missing due to git mirror lag.
> 
> I waited till the git mirrors updated this time.
> 
> Please pull the latest tip/perf/core-3 tree, which can be found at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
> tip/perf/core-3
> 
> 
> Michal Marek (1):
>       ftrace/kbuild: Add recordmcount files to force full build
> 
> ----
>  scripts/Makefile.build |    7 +++++--
>  1 files changed, 5 insertions(+), 2 deletions(-)

Pulled, thanks Steve!

	Ingo