4 files changed, 7 insertions, 24 deletions

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 834b67c4db5a..aa2df3eaeb29 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -57,7 +57,6 @@ config SUPERH32
         select HAVE_FUNCTION_TRACER
         select HAVE_FTRACE_MCOUNT_RECORD
         select HAVE_DYNAMIC_FTRACE
-        select HAVE_FUNCTION_TRACE_MCOUNT_TEST
         select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE
         select ARCH_WANT_IPC_PARSE_VERSION
         select HAVE_FUNCTION_GRAPH_TRACER
diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index d4d16e4be07c..bf5b3f5f4962 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -32,7 +32,8 @@ endif
 
 cflags-$(CONFIG_CPU_SH2)                := $(call cc-option,-m2,)
 cflags-$(CONFIG_CPU_SH2A)               += $(call cc-option,-m2a,) \
-                                           $(call cc-option,-m2a-nofpu,)
+                                           $(call cc-option,-m2a-nofpu,) \
+                                           $(call cc-option,-m4-nofpu,)
 cflags-$(CONFIG_CPU_SH3)                := $(call cc-option,-m3,)
 cflags-$(CONFIG_CPU_SH4)                := $(call cc-option,-m4,) \
         $(call cc-option,-mno-implicit-fp,-m4-nofpu)
diff --git a/arch/sh/kernel/ftrace.c b/arch/sh/kernel/ftrace.c
index 3c74f53db6db..079d70e6d74b 100644
--- a/arch/sh/kernel/ftrace.c
+++ b/arch/sh/kernel/ftrace.c
@@ -344,6 +344,9 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
         struct ftrace_graph_ent trace;
         unsigned long return_hooker = (unsigned long)&return_to_handler;
 
+        if (unlikely(ftrace_graph_is_dead()))
+                return;
+
         if (unlikely(atomic_read(&current->tracing_graph_pause)))
                 return;
 
diff --git a/arch/sh/lib/mcount.S b/arch/sh/lib/mcount.S
index 52aa2011d753..7a8572f9d58b 100644
--- a/arch/sh/lib/mcount.S
+++ b/arch/sh/lib/mcount.S
@@ -92,13 +92,6 @@ mcount:
         rts
          nop
 #else
-#ifndef CONFIG_DYNAMIC_FTRACE
-        mov.l   .Lfunction_trace_stop, r0
-        mov.l   @r0, r0
-        tst     r0, r0
-        bf      ftrace_stub
-#endif
-
         MCOUNT_ENTER()
 
 #ifdef CONFIG_DYNAMIC_FTRACE
@@ -174,11 +167,6 @@ ftrace_graph_call:
 
         .globl ftrace_caller
 ftrace_caller:
-        mov.l   .Lfunction_trace_stop, r0
-        mov.l   @r0, r0
-        tst     r0, r0
-        bf      ftrace_stub
-
         MCOUNT_ENTER()
 
         .globl ftrace_call
@@ -196,8 +184,6 @@ ftrace_call:
 #endif /* CONFIG_DYNAMIC_FTRACE */
 
         .align 2
-.Lfunction_trace_stop:
-        .long   function_trace_stop
 
 /*
  * NOTE: From here on the locations of the .Lftrace_stub label and
@@ -217,12 +203,7 @@ ftrace_stub:
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
         .globl  ftrace_graph_caller
 ftrace_graph_caller:
-        mov.l   2f, r0
-        mov.l   @r0, r0
-        tst     r0, r0
-        bt      1f
-
-        mov.l   3f, r1
+        mov.l   2f, r1
         jmp     @r1
          nop
 1:
@@ -242,8 +223,7 @@ ftrace_graph_caller:
         MCOUNT_LEAVE()
 
         .align 2
-2:      .long   function_trace_stop
-3:      .long   skip_trace
+2:      .long   skip_trace
 .Lprepare_ftrace_return:
         .long   prepare_ftrace_return