From 770ec944f7ebb38902bb3ed7e8617485789ccdd7 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Sat, 11 Jul 2009 20:33:34 +0900
Subject: [PATCH] --- yaml --- r: 163330 b: refs/heads/master c:
 a470b95e99ea77ef1e307ff181e59a4a16caa4f4 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/arch/sh/lib/mcount.S | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c28769c29841..c431eeef1d73 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe27932052aebf77ac5f3e73962825d2aeb457a0
+refs/heads/master: a470b95e99ea77ef1e307ff181e59a4a16caa4f4
diff --git a/trunk/arch/sh/lib/mcount.S b/trunk/arch/sh/lib/mcount.S
index bd3ec648becc..9e397aafc165 100644
--- a/trunk/arch/sh/lib/mcount.S
+++ b/trunk/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: