GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-07 07:08:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

sh: ftrace: Remove check of obsolete variable function_trace_stop

Browse source 
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:
Steven Rostedt (Red Hat) 2014-06-25 12:27:42 -04:00 • committed by Steven Rostedt
parent 2563b9d965
commit 41dc27e3b9
2 changed files with 2 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/sh/Kconfig
View file

@ -57,7 +57,6 @@ config SUPERH32
select HAVE_FUNCTION_TRACER select HAVE_FUNCTION_TRACER
select HAVE_FTRACE_MCOUNT_RECORD select HAVE_FTRACE_MCOUNT_RECORD
select HAVE_DYNAMIC_FTRACE select HAVE_DYNAMIC_FTRACE
select HAVE_FUNCTION_TRACE_MCOUNT_TEST
select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE
select ARCH_WANT_IPC_PARSE_VERSION select ARCH_WANT_IPC_PARSE_VERSION
select HAVE_FUNCTION_GRAPH_TRACER select HAVE_FUNCTION_GRAPH_TRACER

24
arch/sh/lib/mcount.S
View file

@ -92,13 +92,6 @@ mcount:
rts rts
nop nop
#else #else
#ifndef CONFIG_DYNAMIC_FTRACE
mov.l .Lfunction_trace_stop, r0
mov.l @r0, r0
tst r0, r0
bf ftrace_stub
#endif
MCOUNT_ENTER() MCOUNT_ENTER()
#ifdef CONFIG_DYNAMIC_FTRACE #ifdef CONFIG_DYNAMIC_FTRACE
@ -174,11 +167,6 @@ ftrace_graph_call:
.globl ftrace_caller .globl ftrace_caller
ftrace_caller: ftrace_caller:
mov.l .Lfunction_trace_stop, r0
mov.l @r0, r0
tst r0, r0
bf ftrace_stub
MCOUNT_ENTER() MCOUNT_ENTER()
.globl ftrace_call .globl ftrace_call
@ -196,8 +184,6 @@ ftrace_call:
#endif /* CONFIG_DYNAMIC_FTRACE */ #endif /* CONFIG_DYNAMIC_FTRACE */
.align 2 .align 2
.Lfunction_trace_stop:
.long function_trace_stop
/* /*
* NOTE: From here on the locations of the .Lftrace_stub label and * NOTE: From here on the locations of the .Lftrace_stub label and
@ -217,12 +203,7 @@ ftrace_stub:
#ifdef CONFIG_FUNCTION_GRAPH_TRACER #ifdef CONFIG_FUNCTION_GRAPH_TRACER
.globl ftrace_graph_caller .globl ftrace_graph_caller
ftrace_graph_caller: ftrace_graph_caller:
mov.l 2f, r0 mov.l 2f, r1
mov.l @r0, r0
tst r0, r0
bt 1f
mov.l 3f, r1
jmp @r1 jmp @r1
nop nop
1: 1:
@ -242,8 +223,7 @@ ftrace_graph_caller:
MCOUNT_LEAVE() MCOUNT_LEAVE()
.align 2 .align 2
2: .long function_trace_stop 2: .long skip_trace
3: .long skip_trace
.Lprepare_ftrace_return: .Lprepare_ftrace_return:
.long prepare_ftrace_return .long prepare_ftrace_return