sh: 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. [ Please test this on your arch ] Cc: Matt Fleming <matt@console-pimps.org> Cc: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
parent
2563b9d965
commit
41dc27e3b9
2 changed files with 2 additions and 23 deletions
|
@ -57,7 +57,6 @@ config SUPERH32
|
|||
select HAVE_FUNCTION_TRACER
|
||||
select HAVE_FTRACE_MCOUNT_RECORD
|
||||
select HAVE_DYNAMIC_FTRACE
|
||||
select HAVE_FUNCTION_TRACE_MCOUNT_TEST
|
||||
select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE
|
||||
select ARCH_WANT_IPC_PARSE_VERSION
|
||||
select HAVE_FUNCTION_GRAPH_TRACER
|
||||
|
|
|
@ -92,13 +92,6 @@ mcount:
|
|||
rts
|
||||
nop
|
||||
#else
|
||||
#ifndef CONFIG_DYNAMIC_FTRACE
|
||||
mov.l .Lfunction_trace_stop, r0
|
||||
mov.l @r0, r0
|
||||
tst r0, r0
|
||||
bf ftrace_stub
|
||||
#endif
|
||||
|
||||
MCOUNT_ENTER()
|
||||
|
||||
#ifdef CONFIG_DYNAMIC_FTRACE
|
||||
|
@ -174,11 +167,6 @@ ftrace_graph_call:
|
|||
|
||||
.globl ftrace_caller
|
||||
ftrace_caller:
|
||||
mov.l .Lfunction_trace_stop, r0
|
||||
mov.l @r0, r0
|
||||
tst r0, r0
|
||||
bf ftrace_stub
|
||||
|
||||
MCOUNT_ENTER()
|
||||
|
||||
.globl ftrace_call
|
||||
|
@ -196,8 +184,6 @@ ftrace_call:
|
|||
#endif /* CONFIG_DYNAMIC_FTRACE */
|
||||
|
||||
.align 2
|
||||
.Lfunction_trace_stop:
|
||||
.long function_trace_stop
|
||||
|
||||
/*
|
||||
* NOTE: From here on the locations of the .Lftrace_stub label and
|
||||
|
@ -217,12 +203,7 @@ ftrace_stub:
|
|||
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
|
||||
.globl ftrace_graph_caller
|
||||
ftrace_graph_caller:
|
||||
mov.l 2f, r0
|
||||
mov.l @r0, r0
|
||||
tst r0, r0
|
||||
bt 1f
|
||||
|
||||
mov.l 3f, r1
|
||||
mov.l 2f, r1
|
||||
jmp @r1
|
||||
nop
|
||||
1:
|
||||
|
@ -242,8 +223,7 @@ ftrace_graph_caller:
|
|||
MCOUNT_LEAVE()
|
||||
|
||||
.align 2
|
||||
2: .long function_trace_stop
|
||||
3: .long skip_trace
|
||||
2: .long skip_trace
|
||||
.Lprepare_ftrace_return:
|
||||
.long prepare_ftrace_return
|
||||
|
||||
|
|
Loading…
Reference in a new issue