AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-25 07:30:53 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

ftrace: x86: 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.

Link: http://lkml.kernel.org/r/53C54D32.6000000@zytor.com

Acked-by: H. Peter Anvin <hpa@linux.intel.com>
Reviewed-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Steven Rostedt (Red Hat) 2014-06-25 11:59:45 -04:00 committed by Steven Rostedt
parent 7544256aa2
commit fdc841b58c
3 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/Kconfig
View File

@ -54,7 +54,6 @@ config X86
select HAVE_FUNCTION_TRACER select HAVE_FUNCTION_TRACER
select HAVE_FUNCTION_GRAPH_TRACER select HAVE_FUNCTION_GRAPH_TRACER
select HAVE_FUNCTION_GRAPH_FP_TEST select HAVE_FUNCTION_GRAPH_FP_TEST
select HAVE_FUNCTION_TRACE_MCOUNT_TEST
select HAVE_SYSCALL_TRACEPOINTS select HAVE_SYSCALL_TRACEPOINTS
select SYSCTL_EXCEPTION_TRACE select SYSCTL_EXCEPTION_TRACE
select HAVE_KVM select HAVE_KVM

9
arch/x86/kernel/entry_32.S
View File

@ -1058,9 +1058,6 @@ ENTRY(mcount)
END(mcount) END(mcount)
ENTRY(ftrace_caller) ENTRY(ftrace_caller)
cmpl $0, function_trace_stop
jne ftrace_stub
pushl %eax pushl %eax
pushl %ecx pushl %ecx
pushl %edx pushl %edx
@ -1092,8 +1089,6 @@ END(ftrace_caller)
ENTRY(ftrace_regs_caller) ENTRY(ftrace_regs_caller)
pushf /* push flags before compare (in cs location) */ pushf /* push flags before compare (in cs location) */
cmpl $0, function_trace_stop
jne ftrace_restore_flags
/* /*
* i386 does not save SS and ESP when coming from kernel. * i386 does not save SS and ESP when coming from kernel.
@ -1152,7 +1147,6 @@ GLOBAL(ftrace_regs_call)
popf /* Pop flags at end (no addl to corrupt flags) */ popf /* Pop flags at end (no addl to corrupt flags) */
jmp ftrace_ret jmp ftrace_ret
ftrace_restore_flags:
popf popf
jmp ftrace_stub jmp ftrace_stub
#else /* ! CONFIG_DYNAMIC_FTRACE */ #else /* ! CONFIG_DYNAMIC_FTRACE */
@ -1161,9 +1155,6 @@ ENTRY(mcount)
cmpl $__PAGE_OFFSET, %esp cmpl $__PAGE_OFFSET, %esp
jb ftrace_stub /* Paging not enabled yet? */ jb ftrace_stub /* Paging not enabled yet? */
cmpl $0, function_trace_stop
jne ftrace_stub
cmpl $ftrace_stub, ftrace_trace_function cmpl $ftrace_stub, ftrace_trace_function
jnz trace jnz trace
#ifdef CONFIG_FUNCTION_GRAPH_TRACER #ifdef CONFIG_FUNCTION_GRAPH_TRACER

18
arch/x86/kernel/mcount_64.S
View File

@ -46,10 +46,6 @@ END(function_hook)
.endm .endm
ENTRY(ftrace_caller) ENTRY(ftrace_caller)
/* Check if tracing was disabled (quick check) */
cmpl $0, function_trace_stop
jne ftrace_stub
ftrace_caller_setup ftrace_caller_setup
/* regs go into 4th parameter (but make it NULL) */ /* regs go into 4th parameter (but make it NULL) */
movq $0, %rcx movq $0, %rcx
@ -73,10 +69,6 @@ ENTRY(ftrace_regs_caller)
/* Save the current flags before compare (in SS location)*/ /* Save the current flags before compare (in SS location)*/
pushfq pushfq
/* Check if tracing was disabled (quick check) */
cmpl $0, function_trace_stop
jne ftrace_restore_flags
/* skip=8 to skip flags saved in SS */ /* skip=8 to skip flags saved in SS */
ftrace_caller_setup 8 ftrace_caller_setup 8
@ -131,7 +123,7 @@ GLOBAL(ftrace_regs_call)
popfq popfq
jmp ftrace_return jmp ftrace_return
ftrace_restore_flags:
popfq popfq
jmp ftrace_stub jmp ftrace_stub
@ -141,9 +133,6 @@ END(ftrace_regs_caller)
#else /* ! CONFIG_DYNAMIC_FTRACE */ #else /* ! CONFIG_DYNAMIC_FTRACE */
ENTRY(function_hook) ENTRY(function_hook)
cmpl $0, function_trace_stop
jne ftrace_stub
cmpq $ftrace_stub, ftrace_trace_function cmpq $ftrace_stub, ftrace_trace_function
jnz trace jnz trace
@ -182,10 +171,6 @@ END(function_hook)
ENTRY(ftrace_graph_caller) ENTRY(ftrace_graph_caller)
MCOUNT_SAVE_FRAME MCOUNT_SAVE_FRAME
/* Check if tracing was disabled (quick check) */
cmpl $0, function_trace_stop
jne fgraph_skip
#ifdef CC_USING_FENTRY #ifdef CC_USING_FENTRY
leaq SS+16(%rsp), %rdi leaq SS+16(%rsp), %rdi
movq $0, %rdx /* No framepointers needed */ movq $0, %rdx /* No framepointers needed */
@ -198,7 +183,6 @@ ENTRY(ftrace_graph_caller)
call prepare_ftrace_return call prepare_ftrace_return
fgraph_skip:
MCOUNT_RESTORE_FRAME MCOUNT_RESTORE_FRAME
retq retq