diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-06-25 12:22:53 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-07-18 13:57:03 -0400 |
| commit | 2563b9d9652b794ffdfea26247ae1c995635bcc9 (patch) | |
| tree | ee79eaa20788fe37960a7daf5864933f989c4711 /arch/sparc/lib | |
| parent | 6beecb95620c1e8f03db2a34f5c5e86ec88eb57a (diff) | |
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>
Diffstat (limited to 'arch/sparc/lib')
| -rw-r--r-- | arch/sparc/lib/mcount.S | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/sparc/lib/mcount.S b/arch/sparc/lib/mcount.S index 3ad6cbdc2163..0b0ed4d34219 100644 --- a/arch/sparc/lib/mcount.S +++ b/arch/sparc/lib/mcount.S | |||
| @@ -24,10 +24,7 @@ mcount: | |||
| 24 | #ifdef CONFIG_DYNAMIC_FTRACE | 24 | #ifdef CONFIG_DYNAMIC_FTRACE |
| 25 | /* Do nothing, the retl/nop below is all we need. */ | 25 | /* Do nothing, the retl/nop below is all we need. */ |
| 26 | #else | 26 | #else |
| 27 | sethi %hi(function_trace_stop), %g1 | 27 | sethi %hi(ftrace_trace_function), %g1 |
| 28 | lduw [%g1 + %lo(function_trace_stop)], %g2 | ||
| 29 | brnz,pn %g2, 2f | ||
| 30 | sethi %hi(ftrace_trace_function), %g1 | ||
| 31 | sethi %hi(ftrace_stub), %g2 | 28 | sethi %hi(ftrace_stub), %g2 |
| 32 | ldx [%g1 + %lo(ftrace_trace_function)], %g1 | 29 | ldx [%g1 + %lo(ftrace_trace_function)], %g1 |
| 33 | or %g2, %lo(ftrace_stub), %g2 | 30 | or %g2, %lo(ftrace_stub), %g2 |
| @@ -80,11 +77,8 @@ ftrace_stub: | |||
| 80 | .globl ftrace_caller | 77 | .globl ftrace_caller |
| 81 | .type ftrace_caller,#function | 78 | .type ftrace_caller,#function |
| 82 | ftrace_caller: | 79 | ftrace_caller: |
| 83 | sethi %hi(function_trace_stop), %g1 | ||
| 84 | mov %i7, %g2 | 80 | mov %i7, %g2 |
| 85 | lduw [%g1 + %lo(function_trace_stop)], %g1 | 81 | mov %fp, %g3 |
| 86 | brnz,pn %g1, ftrace_stub | ||
| 87 | mov %fp, %g3 | ||
| 88 | save %sp, -176, %sp | 82 | save %sp, -176, %sp |
| 89 | mov %g2, %o1 | 83 | mov %g2, %o1 |
| 90 | mov %g2, %l0 | 84 | mov %g2, %l0 |
