ftrace/x86: mcount offset calculation

Do the mcount offset adjustment in the recordmcount.pl/recordmcount.[ch]
at compile time and not in ftrace_call_adjust at run time.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

2 files changed, 4 insertions, 0 deletions

diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c
index 0e18975824f7..7648a5d11154 100644
--- a/scripts/recordmcount.c
+++ b/scripts/recordmcount.c
@@ -335,6 +335,7 @@ do_file(char const *const fname)
                 reltype = R_386_32;
                 make_nop = make_nop_x86;
                 ideal_nop = ideal_nop5_x86_32;
+                mcount_adjust_32 = -1;
                 break;
         case EM_ARM:     reltype = R_ARM_ABS32;
                          altmcount = "__gnu_mcount_nc";
@@ -350,6 +351,7 @@ do_file(char const *const fname)
                 make_nop = make_nop_x86;
                 ideal_nop = ideal_nop5_x86_64;
                 reltype = R_X86_64_64;
+                mcount_adjust_64 = -1;
                 break;
         }  /* end switch */
 
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index a871cd414055..414e7f5e42ec 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -223,6 +223,7 @@ if ($arch eq "x86_64") {
     $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\smcount([+-]0x[0-9a-zA-Z]+)?\$";
     $type = ".quad";
     $alignment = 8;
+    $mcount_adjust = -1;
 
     # force flags for this arch
     $ld .= " -m elf_x86_64";
@@ -232,6 +233,7 @@ if ($arch eq "x86_64") {
 
 } elsif ($arch eq "i386") {
     $alignment = 4;
+    $mcount_adjust = -1;
 
     # force flags for this arch
     $ld .= " -m elf_i386";