diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2014-06-26 10:43:25 +0200 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-07-18 19:58:11 +0200 |
| commit | 2a62a57a0633c7bbc9689d738ec0235e2ec822dc (patch) | |
| tree | 02ef25057e1f8aaa6964fd51baba630e25a0bf25 /arch/s390/kernel/mcount.S | |
| parent | arm64, ftrace: Remove check of obsolete variable function_trace_stop (diff) | |
| download | linux-2a62a57a0633c7bbc9689d738ec0235e2ec822dc.tar.xz linux-2a62a57a0633c7bbc9689d738ec0235e2ec822dc.zip | |
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>
Diffstat (limited to 'arch/s390/kernel/mcount.S')
| -rw-r--r-- | arch/s390/kernel/mcount.S | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/s390/kernel/mcount.S b/arch/s390/kernel/mcount.S index 08dcf21cb8df..433c6dbfa442 100644 --- 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 |