aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel/ftrace.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/s390/kernel/ftrace.c')
-rw-r--r--arch/s390/kernel/ftrace.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/s390/kernel/ftrace.c b/arch/s390/kernel/ftrace.c
index 14b61954d5a8..f908e42e11c4 100644
--- a/arch/s390/kernel/ftrace.c
+++ b/arch/s390/kernel/ftrace.c
@@ -17,8 +17,6 @@
17#include <asm/asm-offsets.h> 17#include <asm/asm-offsets.h>
18#include "entry.h" 18#include "entry.h"
19 19
20#ifdef CONFIG_DYNAMIC_FTRACE
21
22void ftrace_disable_code(void); 20void ftrace_disable_code(void);
23void ftrace_enable_insn(void); 21void ftrace_enable_insn(void);
24 22
@@ -142,8 +140,6 @@ int __init ftrace_dyn_arch_init(void)
142 return 0; 140 return 0;
143} 141}
144 142
145#endif /* CONFIG_DYNAMIC_FTRACE */
146
147#ifdef CONFIG_FUNCTION_GRAPH_TRACER 143#ifdef CONFIG_FUNCTION_GRAPH_TRACER
148/* 144/*
149 * Hook the return address and push it in the stack of return addresses 145 * Hook the return address and push it in the stack of return addresses
@@ -169,7 +165,6 @@ out:
169 return parent; 165 return parent;
170} 166}
171 167
172#ifdef CONFIG_DYNAMIC_FTRACE
173/* 168/*
174 * Patch the kernel code at ftrace_graph_caller location. The instruction 169 * Patch the kernel code at ftrace_graph_caller location. The instruction
175 * there is branch relative and save to prepare_ftrace_return. To disable 170 * there is branch relative and save to prepare_ftrace_return. To disable
@@ -219,5 +214,4 @@ int ftrace_disable_ftrace_graph_caller(void)
219} 214}
220 215
221#endif /* CONFIG_64BIT */ 216#endif /* CONFIG_64BIT */
222#endif /* CONFIG_DYNAMIC_FTRACE */
223#endif /* CONFIG_FUNCTION_GRAPH_TRACER */ 217#endif /* CONFIG_FUNCTION_GRAPH_TRACER */