Commit a470b95e authored by Paul Mundt's avatar Paul Mundt

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: default avatarPaul Mundt <lethal@linux-sh.org>
parent fe279320
...@@ -192,6 +192,10 @@ ftrace_call: ...@@ -192,6 +192,10 @@ ftrace_call:
#endif /* CONFIG_FUNCTION_GRAPH_TRACER */ #endif /* CONFIG_FUNCTION_GRAPH_TRACER */
#endif /* CONFIG_DYNAMIC_FTRACE */ #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 * NOTE: From here on the locations of the .Lftrace_stub label and
* ftrace_stub itself are fixed. Adding additional data here will skew * ftrace_stub itself are fixed. Adding additional data here will skew
...@@ -199,7 +203,6 @@ ftrace_call: ...@@ -199,7 +203,6 @@ ftrace_call:
* Place new labels either after the ftrace_stub body, or before * Place new labels either after the ftrace_stub body, or before
* ftrace_caller. You have been warned. * ftrace_caller. You have been warned.
*/ */
.align 2
.Lftrace_stub: .Lftrace_stub:
.long ftrace_stub .long ftrace_stub
...@@ -223,8 +226,6 @@ stack_panic: ...@@ -223,8 +226,6 @@ stack_panic:
nop nop
.align 2 .align 2
.Lfunction_trace_stop:
.long function_trace_stop
.L_ebss: .L_ebss:
.long _ebss .long _ebss
.L_init_thread_union: .L_init_thread_union:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment