Re: [RFA][PATCH 18/27] sparc64,ftrace: Remove check of obsolete variable function_trace_stop

[Steven Rostedt]

David,

Do you have any problem with this patch going through my tree? It
compiles, but I do not have any hardware to test it. If you can verify
that this patch works and ack it, it would be much appreciated.

This code is at:

 git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git

branch: rfc/remove-function-trace-stop

Thanks!

-- Steve

On Thu, 26 Jun 2014 12:52:39 -0400
Steven Rostedt <rostedt@xxxxxxxxxxx> wrote:

> From: "Steven Rostedt (Red Hat)" <rostedt@xxxxxxxxxxx>
> 
> Nothing sets function_trace_stop to disable function tracing anymore.
> Remove the check for it in the arch code.
> 
> [ Please test this on your arch ]
> 
> Cc: David S. Miller <davem@xxxxxxxxxxxxx>
> Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
> ---
>  arch/sparc/Kconfig      |  1 -
>  arch/sparc/lib/mcount.S | 10 ++--------
>  2 files changed, 2 insertions(+), 9 deletions(-)
> 
> diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
> index 29f2e988c56a..abd7d5575a7d 100644
> --- a/arch/sparc/Kconfig
> +++ b/arch/sparc/Kconfig
> @@ -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
> diff --git a/arch/sparc/lib/mcount.S b/arch/sparc/lib/mcount.S
> index 3ad6cbdc2163..0b0ed4d34219 100644
> --- a/arch/sparc/lib/mcount.S
> +++ b/arch/sparc/lib/mcount.S
> @@ -24,10 +24,7 @@ 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_trace_function), %g1
>  	sethi		%hi(ftrace_stub), %g2
>  	ldx		[%g1 + %lo(ftrace_trace_function)], %g1
>  	or		%g2, %lo(ftrace_stub), %g2
> @@ -80,11 +77,8 @@ 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
> +	mov		%fp, %g3
>  	save		%sp, -176, %sp
>  	mov		%g2, %o1
>  	mov		%g2, %l0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/