diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-07-11 07:33:34 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-07-11 07:33:34 -0400 |
commit | a470b95e99ea77ef1e307ff181e59a4a16caa4f4 (patch) | |
tree | aca416b5074ad8a8eeea8fe3eb987c380267d896 /arch/sh/lib | |
parent | fe27932052aebf77ac5f3e73962825d2aeb457a0 (diff) |
sh: Fix up ftrace build error when STACK_DEBUG=n.
Presently the closest reference to function_trace_stop is within a
CONFIG_STACK_DEBUG block. When this is turned off, the build bails out
with a pcrel too far error. Reorder things a bit to handle the various
combinations.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/lib')
-rw-r--r-- | arch/sh/lib/mcount.S | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/sh/lib/mcount.S b/arch/sh/lib/mcount.S index bd3ec648becc..9e397aafc165 100644 --- a/arch/sh/lib/mcount.S +++ b/arch/sh/lib/mcount.S | |||
@@ -192,6 +192,10 @@ ftrace_call: | |||
192 | #endif /* CONFIG_FUNCTION_GRAPH_TRACER */ | 192 | #endif /* CONFIG_FUNCTION_GRAPH_TRACER */ |
193 | #endif /* CONFIG_DYNAMIC_FTRACE */ | 193 | #endif /* CONFIG_DYNAMIC_FTRACE */ |
194 | 194 | ||
195 | .align 2 | ||
196 | .Lfunction_trace_stop: | ||
197 | .long function_trace_stop | ||
198 | |||
195 | /* | 199 | /* |
196 | * NOTE: From here on the locations of the .Lftrace_stub label and | 200 | * NOTE: From here on the locations of the .Lftrace_stub label and |
197 | * ftrace_stub itself are fixed. Adding additional data here will skew | 201 | * ftrace_stub itself are fixed. Adding additional data here will skew |
@@ -199,7 +203,6 @@ ftrace_call: | |||
199 | * Place new labels either after the ftrace_stub body, or before | 203 | * Place new labels either after the ftrace_stub body, or before |
200 | * ftrace_caller. You have been warned. | 204 | * ftrace_caller. You have been warned. |
201 | */ | 205 | */ |
202 | .align 2 | ||
203 | .Lftrace_stub: | 206 | .Lftrace_stub: |
204 | .long ftrace_stub | 207 | .long ftrace_stub |
205 | 208 | ||
@@ -223,8 +226,6 @@ stack_panic: | |||
223 | nop | 226 | nop |
224 | 227 | ||
225 | .align 2 | 228 | .align 2 |
226 | .Lfunction_trace_stop: | ||
227 | .long function_trace_stop | ||
228 | .L_ebss: | 229 | .L_ebss: |
229 | .long _ebss | 230 | .long _ebss |
230 | .L_init_thread_union: | 231 | .L_init_thread_union: |