aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2014-06-25 12:11:02 -0400
committerSteven Rostedt <rostedt@goodmis.org>2014-07-18 13:57:03 -0400
commit6beecb95620c1e8f03db2a34f5c5e86ec88eb57a (patch)
treebd770676f8a37fb376616ac80511a639c7cf0d58
parentfdc841b58cf5268fa349eaf9f74fd9a8c6944a34 (diff)
tile: 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. Cc: Chris Metcalf <cmetcalf@tilera.com> Acked-by: Zhigang Lu<zlu@tilera.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r--arch/tile/Kconfig1
-rw-r--r--arch/tile/kernel/mcount_64.S18
2 files changed, 0 insertions, 19 deletions
diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index 4f3006b600e3..7fcd492adbfc 100644
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -128,7 +128,6 @@ config TILEGX
128 select SPARSE_IRQ 128 select SPARSE_IRQ
129 select GENERIC_IRQ_LEGACY_ALLOC_HWIRQ 129 select GENERIC_IRQ_LEGACY_ALLOC_HWIRQ
130 select HAVE_FUNCTION_TRACER 130 select HAVE_FUNCTION_TRACER
131 select HAVE_FUNCTION_TRACE_MCOUNT_TEST
132 select HAVE_FUNCTION_GRAPH_TRACER 131 select HAVE_FUNCTION_GRAPH_TRACER
133 select HAVE_DYNAMIC_FTRACE 132 select HAVE_DYNAMIC_FTRACE
134 select HAVE_FTRACE_MCOUNT_RECORD 133 select HAVE_FTRACE_MCOUNT_RECORD
diff --git a/arch/tile/kernel/mcount_64.S b/arch/tile/kernel/mcount_64.S
index 70d7bb0c4d8f..3c2b8d5e1d1a 100644
--- a/arch/tile/kernel/mcount_64.S
+++ b/arch/tile/kernel/mcount_64.S
@@ -77,15 +77,6 @@ STD_ENDPROC(__mcount)
77 77
78 .align 64 78 .align 64
79STD_ENTRY(ftrace_caller) 79STD_ENTRY(ftrace_caller)
80 moveli r11, hw2_last(function_trace_stop)
81 { shl16insli r11, r11, hw1(function_trace_stop); move r12, lr }
82 { shl16insli r11, r11, hw0(function_trace_stop); move lr, r10 }
83 ld r11, r11
84 beqz r11, 1f
85 jrp r12
86
871:
88 { move r10, lr; move lr, r12 }
89 MCOUNT_SAVE_REGS 80 MCOUNT_SAVE_REGS
90 81
91 /* arg1: self return address */ 82 /* arg1: self return address */
@@ -119,15 +110,6 @@ STD_ENDPROC(ftrace_caller)
119 110
120 .align 64 111 .align 64
121STD_ENTRY(__mcount) 112STD_ENTRY(__mcount)
122 moveli r11, hw2_last(function_trace_stop)
123 { shl16insli r11, r11, hw1(function_trace_stop); move r12, lr }
124 { shl16insli r11, r11, hw0(function_trace_stop); move lr, r10 }
125 ld r11, r11
126 beqz r11, 1f
127 jrp r12
128
1291:
130 { move r10, lr; move lr, r12 }
131 { 113 {
132 moveli r11, hw2_last(ftrace_trace_function) 114 moveli r11, hw2_last(ftrace_trace_function)
133 moveli r13, hw2_last(ftrace_stub) 115 moveli r13, hw2_last(ftrace_stub)