leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s390/ftrace: remove check of obsolete variable function_trace_stop

Browse Source 
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>
This commit is contained in:
Heiko Carstens 2014-06-26 10:43:25 +02:00 committed by Steven Rostedt
parent ac694fda32
commit 2a62a57a06
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/s390/Kconfig
View File

@ -116,7 +116,6 @@ config S390
select HAVE_FTRACE_MCOUNT_RECORD select HAVE_FTRACE_MCOUNT_RECORD
select HAVE_FUNCTION_GRAPH_TRACER select HAVE_FUNCTION_GRAPH_TRACER
select HAVE_FUNCTION_TRACER select HAVE_FUNCTION_TRACER
select HAVE_FUNCTION_TRACE_MCOUNT_TEST
select HAVE_FUTEX_CMPXCHG if FUTEX select HAVE_FUTEX_CMPXCHG if FUTEX
select HAVE_KERNEL_BZIP2 select HAVE_KERNEL_BZIP2
select HAVE_KERNEL_GZIP select HAVE_KERNEL_GZIP

10
arch/s390/kernel/mcount.S
View File

@ -21,13 +21,9 @@ ENTRY(_mcount)
ENTRY(ftrace_caller) ENTRY(ftrace_caller)
#endif #endif
stm %r2,%r5,16(%r15) stm %r2,%r5,16(%r15)
bras %r1,2f bras %r1,1f
0: .long ftrace_trace_function 0: .long ftrace_trace_function
1: .long function_trace_stop 1: st %r14,56(%r15)
2: l %r2,1b-0b(%r1)
icm %r2,0xf,0(%r2)
jnz 3f
st %r14,56(%r15)
lr %r0,%r15 lr %r0,%r15
ahi %r15,-96 ahi %r15,-96
l %r3,100(%r15) l %r3,100(%r15)
@ -50,7 +46,7 @@ ENTRY(ftrace_graph_caller)
#endif #endif
ahi %r15,96 ahi %r15,96
l %r14,56(%r15) l %r14,56(%r15)
3: lm %r2,%r5,16(%r15) lm %r2,%r5,16(%r15)
br %r14 br %r14
#ifdef CONFIG_FUNCTION_GRAPH_TRACER #ifdef CONFIG_FUNCTION_GRAPH_TRACER

3
arch/s390/kernel/mcount64.S
View File

@ -20,9 +20,6 @@ ENTRY(_mcount)
ENTRY(ftrace_caller) ENTRY(ftrace_caller)
#endif #endif
larl %r1,function_trace_stop
icm %r1,0xf,0(%r1)
bnzr %r14
stmg %r2,%r5,32(%r15) stmg %r2,%r5,32(%r15)
stg %r14,112(%r15) stg %r14,112(%r15)
lgr %r1,%r15 lgr %r1,%r15