From: Paul Mundt <lethal@linux-sh.org>
Date: Sat, 11 Jul 2009 11:33:34 +0000 (+0900)
Subject: sh: Fix up ftrace build error when STACK_DEBUG=n.
X-Git-Tag: firefly_0821_release~12920^2~95^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a470b95e99ea77ef1e307ff181e59a4a16caa4f4;p=firefly-linux-kernel-4.4.55.git

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>
---

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: