summaryrefslogtreecommitdiffstats
path: root/arch/sh/lib
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-07-11 20:33:34 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-07-11 20:33:34 +0900
commita470b95e99ea77ef1e307ff181e59a4a16caa4f4 (patch)
treeaca416b5074ad8a8eeea8fe3eb987c380267d896 /arch/sh/lib
parentfe27932052aebf77ac5f3e73962825d2aeb457a0 (diff)
downloadlinux-a470b95e99ea77ef1e307ff181e59a4a16caa4f4.tar.gz
linux-a470b95e99ea77ef1e307ff181e59a4a16caa4f4.tar.bz2
linux-a470b95e99ea77ef1e307ff181e59a4a16caa4f4.zip
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.S7
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:
#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
#endif /* CONFIG_DYNAMIC_FTRACE */
+ .align 2
+.Lfunction_trace_stop:
+ .long function_trace_stop
+
/*
* NOTE: From here on the locations of the .Lftrace_stub label and
* ftrace_stub itself are fixed. Adding additional data here will skew
@@ -199,7 +203,6 @@ ftrace_call:
* Place new labels either after the ftrace_stub body, or before
* ftrace_caller. You have been warned.
*/
- .align 2
.Lftrace_stub:
.long ftrace_stub
@@ -223,8 +226,6 @@ stack_panic:
nop
.align 2
-.Lfunction_trace_stop:
- .long function_trace_stop
.L_ebss:
.long _ebss
.L_init_thread_union: