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

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>

+2 -23
-1
arch/sh/Kconfig
··· 57 57 select HAVE_FUNCTION_TRACER 58 58 select HAVE_FTRACE_MCOUNT_RECORD 59 59 select HAVE_DYNAMIC_FTRACE 60 - select HAVE_FUNCTION_TRACE_MCOUNT_TEST 61 60 select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE 62 61 select ARCH_WANT_IPC_PARSE_VERSION 63 62 select HAVE_FUNCTION_GRAPH_TRACER
+2 -22
arch/sh/lib/mcount.S
··· 92 92 rts 93 93 nop 94 94 #else 95 - #ifndef CONFIG_DYNAMIC_FTRACE 96 - mov.l .Lfunction_trace_stop, r0 97 - mov.l @r0, r0 98 - tst r0, r0 99 - bf ftrace_stub 100 - #endif 101 - 102 95 MCOUNT_ENTER() 103 96 104 97 #ifdef CONFIG_DYNAMIC_FTRACE ··· 167 174 168 175 .globl ftrace_caller 169 176 ftrace_caller: 170 - mov.l .Lfunction_trace_stop, r0 171 - mov.l @r0, r0 172 - tst r0, r0 173 - bf ftrace_stub 174 - 175 177 MCOUNT_ENTER() 176 178 177 179 .globl ftrace_call ··· 184 196 #endif /* CONFIG_DYNAMIC_FTRACE */ 185 197 186 198 .align 2 187 - .Lfunction_trace_stop: 188 - .long function_trace_stop 189 199 190 200 /* 191 201 * NOTE: From here on the locations of the .Lftrace_stub label and ··· 203 217 #ifdef CONFIG_FUNCTION_GRAPH_TRACER 204 218 .globl ftrace_graph_caller 205 219 ftrace_graph_caller: 206 - mov.l 2f, r0 207 - mov.l @r0, r0 208 - tst r0, r0 209 - bt 1f 210 - 211 - mov.l 3f, r1 220 + mov.l 2f, r1 212 221 jmp @r1 213 222 nop 214 223 1: ··· 223 242 MCOUNT_LEAVE() 224 243 225 244 .align 2 226 - 2: .long function_trace_stop 227 - 3: .long skip_trace 245 + 2: .long skip_trace 228 246 .Lprepare_ftrace_return: 229 247 .long prepare_ftrace_return 230 248