s390/ftrace: remove check of obsolete variable function_trace_stop

Remove check of obsolete variable function_trace_stop as requested by
Steven Rostedt.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index bb63499fc5d3c50ec35108d66271d7b801bd4767..f5af5f6ef0f4c1aeeb75c530f27cfc09ddc7beeb 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -116,7 +116,6 @@ config S390
        select HAVE_FTRACE_MCOUNT_RECORD
        select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_FUNCTION_TRACER
-       select HAVE_FUNCTION_TRACE_MCOUNT_TEST
        select HAVE_FUTEX_CMPXCHG if FUTEX
        select HAVE_KERNEL_BZIP2
        select HAVE_KERNEL_GZIP

diff --git a/arch/s390/kernel/mcount.S b/arch/s390/kernel/mcount.S
index 08dcf21cb8dfc040e627b23c1ee279b8822110df..433c6dbfa442439b1b7cd5ce8c8b5a9e5566b44d 100644 (file)
--- a/arch/s390/kernel/mcount.S
+++ b/arch/s390/kernel/mcount.S
@@ -21,13 +21,9 @@ ENTRY(_mcount)
 ENTRY(ftrace_caller)
 #endif
        stm     %r2,%r5,16(%r15)
-       bras    %r1,2f
+       bras    %r1,1f
 0:     .long   ftrace_trace_function
-1:     .long   function_trace_stop
-2:     l       %r2,1b-0b(%r1)
-       icm     %r2,0xf,0(%r2)
-       jnz     3f
-       st      %r14,56(%r15)
+1:     st      %r14,56(%r15)
        lr      %r0,%r15
        ahi     %r15,-96
        l       %r3,100(%r15)
@@ -50,7 +46,7 @@ ENTRY(ftrace_graph_caller)
 #endif
        ahi     %r15,96
        l       %r14,56(%r15)
-3:     lm      %r2,%r5,16(%r15)
+       lm      %r2,%r5,16(%r15)
        br      %r14
 
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER

diff --git a/arch/s390/kernel/mcount64.S b/arch/s390/kernel/mcount64.S
index 1c52eae3396a0845f3176ba8305607ef049f2608..c67a8bf0fd9afa48f4d906cffc7cc5e2594ebf07 100644 (file)
--- a/arch/s390/kernel/mcount64.S
+++ b/arch/s390/kernel/mcount64.S
@@ -20,9 +20,6 @@ ENTRY(_mcount)
 
 ENTRY(ftrace_caller)
 #endif
-       larl    %r1,function_trace_stop
-       icm     %r1,0xf,0(%r1)
-       bnzr    %r14
        stmg    %r2,%r5,32(%r15)
        stg     %r14,112(%r15)
        lgr     %r1,%r15