Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2563b9d9 authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt
Browse files

sparc64,ftrace: Remove check of obsolete variable function_trace_stop 

Nothing sets function_trace_stop to disable function tracing anymore.
Remove the check for it in the arch code.

Link: http://lkml.kernel.org/r/20140703.211820.1674895115102216877.davem@davemloft.net



Cc: David S. Miller <davem@davemloft.net>
OKed-to-go-through-tracing-tree-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 6beecb95

arch/sparc/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ config SPARC64 
	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_GRAPH_FP_TEST

	select HAVE_FUNCTION_TRACE_MCOUNT_TEST

	select HAVE_KRETPROBES

	select HAVE_KPROBES

	select HAVE_RCU_TABLE_FREE if SMP

arch/sparc/lib/mcount.S

+2 −8
Original line number Diff line number Diff line
@@ -24,9 +24,6 @@ mcount: 
#ifdef CONFIG_DYNAMIC_FTRACE

	/* Do nothing, the retl/nop below is all we need.  */

#else

	sethi		%hi(function_trace_stop), %g1

	lduw		[%g1 + %lo(function_trace_stop)], %g2

	brnz,pn		%g2, 2f

	sethi		%hi(ftrace_trace_function), %g1

	sethi		%hi(ftrace_stub), %g2

	ldx		[%g1 + %lo(ftrace_trace_function)], %g1
@@ -80,10 +77,7 @@ ftrace_stub: 
	.globl		ftrace_caller

	.type		ftrace_caller,#function

ftrace_caller:

	sethi		%hi(function_trace_stop), %g1

	mov		%i7, %g2

	lduw		[%g1 + %lo(function_trace_stop)], %g1

	brnz,pn		%g1, ftrace_stub

	mov		%fp, %g3

	save		%sp, -176, %sp

	mov		%g2, %o1