Merge branch 'tip/perf/recordmcount' of git://git.kernel.org/pub/scm/linux/kernel...

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 4d03a7efc68930ffc43c44a428a240cda0c0ec35..4db60b2e2a765aa34acbc3bcee8976f4af6562dd 100644 (file)
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -210,7 +210,7 @@ endif
 
 ifdef CONFIG_FTRACE_MCOUNT_RECORD
 ifdef BUILD_C_RECORDMCOUNT
-cmd_record_mcount = $(srctree)/scripts/recordmcount "$(@)";
+cmd_record_mcount = $(objtree)/scripts/recordmcount "$(@)";
 else
 cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \
        "$(if $(CONFIG_CPU_BIG_ENDIAN),big,little)" \

diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c
index 7f7f7180fe249653d346a11cb5900c92ed08bd13..26e1271259ba51d27343d8a946fe47526e9c2e94 100644 (file)
--- a/scripts/recordmcount.c
+++ b/scripts/recordmcount.c
@@ -313,12 +313,30 @@ do_file(char const *const fname)
 int
 main(int argc, char const *argv[])
 {
+       const char ftrace[] = "kernel/trace/ftrace.o";
+       int ftrace_size = sizeof(ftrace) - 1;
        int n_error = 0;  /* gcc-4.3.0 false positive complaint */
-       if (argc <= 1)
+
+       if (argc <= 1) {
                fprintf(stderr, "usage: recordmcount file.o...\n");
-       else  /* Process each file in turn, allowing deep failure. */
+               return 0;
+       }
+
+       /* Process each file in turn, allowing deep failure. */
        for (--argc, ++argv; 0 < argc; --argc, ++argv) {
                int const sjval = setjmp(jmpenv);
+               int len;
+
+               /*
+                * The file kernel/trace/ftrace.o references the mcount
+                * function but does not call it. Since ftrace.o should
+                * not be traced anyway, we just skip it.
+                */
+               len = strlen(argv[0]);
+               if (len >= ftrace_size &&
+                   strcmp(argv[0] + (len - ftrace_size), ftrace) == 0)
+                       continue;
+
                switch (sjval) {
                default: {
                        fprintf(stderr, "internal error: %s\n", argv[0]);