2 files changed, 6 insertions, 0 deletions

diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 18003ca08196..cccf3adfae50 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -7,6 +7,7 @@ config MICROBLAZE
         def_bool y
         select HAVE_LMB
         select HAVE_FUNCTION_TRACER
+        select HAVE_FUNCTION_TRACE_MCOUNT_TEST
         select USB_ARCH_HAS_EHCI
         select ARCH_WANT_OPTIONAL_GPIOLIB
 
diff --git a/arch/microblaze/kernel/mcount.S b/arch/microblaze/kernel/mcount.S
index a257a1b75ed2..97eef3eea944 100644
--- a/arch/microblaze/kernel/mcount.S
+++ b/arch/microblaze/kernel/mcount.S
@@ -85,6 +85,11 @@ ENTRY(ftrace_stub)
 ENTRY(_mcount)
         SAVE_REGS
         swi     r15, r1, 0;
+        /* MS: HAVE_FUNCTION_TRACE_MCOUNT_TEST begin of checking */
+        lwi     r5, r0, function_trace_stop;
+        bneid   r5, end;
+        nop;
+        /* MS: HAVE_FUNCTION_TRACE_MCOUNT_TEST end of checking */
         /* MS: test function trace if is taken or not */
         lwi     r20, r0, ftrace_trace_function;
         addik   r6, r0, ftrace_stub;