Commit 2a62a57a authored by Heiko Carstens's avatar Heiko Carstens Committed by Steven Rostedt
Browse files

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: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent ac694fda

arch/s390/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -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

arch/s390/kernel/mcount.S

+3 −7
Original line number Diff line number Diff line
@@ -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

arch/s390/kernel/mcount64.S

+0 −3
Original line number Diff line number Diff line
@@ -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