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

sparc64,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.

Link: http://lkml.kernel.org/r/20140703.211820.1674895115102216877.davem@davemloft.net

Cc: David S. Miller <davem@davemloft.net>
OKed-to-go-through-tracing-tree-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

Steven Rostedt (Red Hat) 2563b9d9 6beecb95

+2 -9
-1
arch/sparc/Kconfig
··· 55 55 select HAVE_FUNCTION_TRACER 56 56 select HAVE_FUNCTION_GRAPH_TRACER 57 57 select HAVE_FUNCTION_GRAPH_FP_TEST 58 - select HAVE_FUNCTION_TRACE_MCOUNT_TEST 59 58 select HAVE_KRETPROBES 60 59 select HAVE_KPROBES 61 60 select HAVE_RCU_TABLE_FREE if SMP
+2 -8
arch/sparc/lib/mcount.S
··· 24 24 #ifdef CONFIG_DYNAMIC_FTRACE 25 25 /* Do nothing, the retl/nop below is all we need. */ 26 26 #else 27 - sethi %hi(function_trace_stop), %g1 28 - lduw [%g1 + %lo(function_trace_stop)], %g2 29 - brnz,pn %g2, 2f 30 - sethi %hi(ftrace_trace_function), %g1 27 + sethi %hi(ftrace_trace_function), %g1 31 28 sethi %hi(ftrace_stub), %g2 32 29 ldx [%g1 + %lo(ftrace_trace_function)], %g1 33 30 or %g2, %lo(ftrace_stub), %g2 ··· 77 80 .globl ftrace_caller 78 81 .type ftrace_caller,#function 79 82 ftrace_caller: 80 - sethi %hi(function_trace_stop), %g1 81 83 mov %i7, %g2 82 - lduw [%g1 + %lo(function_trace_stop)], %g1 83 - brnz,pn %g1, ftrace_stub 84 - mov %fp, %g3 84 + mov %fp, %g3 85 85 save %sp, -176, %sp 86 86 mov %g2, %o1 87 87 mov %g2, %l0