function_trace_stop is becoming obsolete and archs should no longer be checking if it is zero or not to perform function tracing. I was able to figure out how to remove this from all the archs BUT s390, which is why I'm posting this "Request For Help" email. All I want to do is remove any checks to function_trace_stop in the mcount code. I haven't the foggiest idea on how to change the s390 code to do this. I made a horrible attempt (attached below) and I now would like someone to do it right for me :-) If you can send me a patch (author it and add your sign off by), I'll add it to my queue of patches to remove this variable. Thanks! No-way-will-I-sign-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx> --- diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index bb63499..f5af5f6 100644 --- 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 08dcf21..807b311 100644 --- a/arch/s390/kernel/mcount.S +++ b/arch/s390/kernel/mcount.S @@ -21,12 +21,9 @@ ENTRY(_mcount) ENTRY(ftrace_caller) #endif stm %r2,%r5,16(%r15) - bras %r1,2f 0: .long ftrace_trace_function -1: .long function_trace_stop -2: l %r2,1b-0b(%r1) icm %r2,0xf,0(%r2) - jnz 3f + jnz 1f st %r14,56(%r15) lr %r0,%r15 ahi %r15,-96 @@ -50,7 +47,7 @@ ENTRY(ftrace_graph_caller) #endif ahi %r15,96 l %r14,56(%r15) -3: lm %r2,%r5,16(%r15) +1: lm %r2,%r5,16(%r15) br %r14 #ifdef CONFIG_FUNCTION_GRAPH_TRACER -- To unsubscribe from this list: send the line "unsubscribe linux-s390" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
