Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ftrace: Cleanup ftrace_dyn_arch_init()

Most of ARCHs use empty ftrace_dyn_arch_init(), introduce a weak common
ftrace_dyn_arch_init() to cleanup them.

Link: https://lkml.kernel.org/r/20210909090216.1955240-1-o451686892@gmail.com

Acked-by: Heiko Carstens <hca@linux.ibm.com> (s390)
Acked-by: Helge Deller <deller@gmx.de> (parisc)
Signed-off-by: Weizhao Ouyang <o451686892@gmail.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

authored by

Weizhao Ouyang and committed by
Steven Rostedt (VMware)
6644c654 21ccc9cd

+5 -61
-5
arch/arm/kernel/ftrace.c
··· 193 193 194 194 return ret; 195 195 } 196 - 197 - int __init ftrace_dyn_arch_init(void) 198 - { 199 - return 0; 200 - } 201 196 #endif /* CONFIG_DYNAMIC_FTRACE */ 202 197 203 198 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
-5
arch/arm64/kernel/ftrace.c
··· 236 236 command |= FTRACE_MAY_SLEEP; 237 237 ftrace_modify_all_code(command); 238 238 } 239 - 240 - int __init ftrace_dyn_arch_init(void) 241 - { 242 - return 0; 243 - } 244 239 #endif /* CONFIG_DYNAMIC_FTRACE */ 245 240 246 241 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
-5
arch/csky/kernel/ftrace.c
··· 133 133 (unsigned long)func, true, true); 134 134 return ret; 135 135 } 136 - 137 - int __init ftrace_dyn_arch_init(void) 138 - { 139 - return 0; 140 - } 141 136 #endif /* CONFIG_DYNAMIC_FTRACE */ 142 137 143 138 #ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS
-6
arch/ia64/kernel/ftrace.c
··· 194 194 flush_icache_range(addr, addr + 16); 195 195 return 0; 196 196 } 197 - 198 - /* run from kstop_machine */ 199 - int __init ftrace_dyn_arch_init(void) 200 - { 201 - return 0; 202 - }
-5
arch/microblaze/kernel/ftrace.c
··· 163 163 return ret; 164 164 } 165 165 166 - int __init ftrace_dyn_arch_init(void) 167 - { 168 - return 0; 169 - } 170 - 171 166 int ftrace_update_ftrace_func(ftrace_func_t func) 172 167 { 173 168 unsigned long ip = (unsigned long)(&ftrace_call);
-5
arch/nds32/kernel/ftrace.c
··· 84 84 /* restore all state needed by the compiler epilogue */ 85 85 } 86 86 87 - int __init ftrace_dyn_arch_init(void) 88 - { 89 - return 0; 90 - } 91 - 92 87 static unsigned long gen_sethi_insn(unsigned long addr) 93 88 { 94 89 unsigned long opcode = 0x46000000;
-5
arch/parisc/kernel/ftrace.c
··· 94 94 #endif 95 95 96 96 #ifdef CONFIG_DYNAMIC_FTRACE 97 - 98 - int __init ftrace_dyn_arch_init(void) 99 - { 100 - return 0; 101 - } 102 97 int ftrace_update_ftrace_func(ftrace_func_t func) 103 98 { 104 99 return 0;
-5
arch/riscv/kernel/ftrace.c
··· 154 154 155 155 return ret; 156 156 } 157 - 158 - int __init ftrace_dyn_arch_init(void) 159 - { 160 - return 0; 161 - } 162 157 #endif 163 158 164 159 #ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS
-5
arch/s390/kernel/ftrace.c
··· 262 262 return 0; 263 263 } 264 264 265 - int __init ftrace_dyn_arch_init(void) 266 - { 267 - return 0; 268 - } 269 - 270 265 void arch_ftrace_update_code(int command) 271 266 { 272 267 if (ftrace_shared_hotpatch_trampoline(NULL))
-5
arch/sh/kernel/ftrace.c
··· 252 252 253 253 return ftrace_modify_code(rec->ip, old, new); 254 254 } 255 - 256 - int __init ftrace_dyn_arch_init(void) 257 - { 258 - return 0; 259 - } 260 255 #endif /* CONFIG_DYNAMIC_FTRACE */ 261 256 262 257 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
-5
arch/sparc/kernel/ftrace.c
··· 82 82 new = ftrace_call_replace(ip, (unsigned long)func); 83 83 return ftrace_modify_code(ip, old, new); 84 84 } 85 - 86 - int __init ftrace_dyn_arch_init(void) 87 - { 88 - return 0; 89 - } 90 85 #endif 91 86 92 87 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
-5
arch/x86/kernel/ftrace.c
··· 252 252 ftrace_modify_all_code(command); 253 253 } 254 254 255 - int __init ftrace_dyn_arch_init(void) 256 - { 257 - return 0; 258 - } 259 - 260 255 /* Currently only x86_64 supports dynamic trampolines */ 261 256 #ifdef CONFIG_X86_64 262 257
+5
kernel/trace/ftrace.c
··· 6847 6847 ftrace_free_mem(NULL, start, end); 6848 6848 } 6849 6849 6850 + int __init __weak ftrace_dyn_arch_init(void) 6851 + { 6852 + return 0; 6853 + } 6854 + 6850 6855 void __init ftrace_init(void) 6851 6856 { 6852 6857 extern unsigned long __start_mcount_loc[];