Skip to content

Commit

Permalink
sh: Fix up ftrace build error when STACK_DEBUG=n.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paul Mundt committed Jul 11, 2009
1 parent fe27932 commit a470b95
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions arch/sh/lib/mcount.S
Original file line number Diff line number Diff line change
Expand Up @@ -192,14 +192,17 @@ 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
* the displacement for the memory table and break the block replacement.
* Place new labels either after the ftrace_stub body, or before
* ftrace_caller. You have been warned.
*/
.align 2
.Lftrace_stub:
.long ftrace_stub

Expand All @@ -223,8 +226,6 @@ stack_panic:
nop

.align 2
.Lfunction_trace_stop:
.long function_trace_stop
.L_ebss:
.long _ebss
.L_init_thread_union:
Expand Down

0 comments on commit a470b95

Please sign in to comment.