2 files changed, 7 insertions, 0 deletions

diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 036cec1fcd24..fd6754b88f87 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -47,6 +47,11 @@ config HAVE_FENTRY
         help
           Arch supports the gcc options -pg with -mfentry
 
+config HAVE_NOP_MCOUNT
+        bool
+        help
+          Arch supports the gcc options -pg with -mrecord-mcount and -nop-mcount
+
 config HAVE_C_RECORDMCOUNT
         bool
         help
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 48b5b466ec7a..468e8527e979 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -2950,12 +2950,14 @@ static int ftrace_update_code(struct module *mod, struct ftrace_page *new_pgs)
                         p = &pg->records[i];
                         p->flags = rec_flags;
 
+#ifndef CC_USING_NOP_MCOUNT
                         /*
                          * Do the initial record conversion from mcount jump
                          * to the NOP instructions.
                          */
                         if (!ftrace_code_disable(mod, p))
                                 break;
+#endif
 
                         update_cnt++;
                 }