From 02b1dc248a87e17e088ec14dd60785a5ed64b2b2 Mon Sep 17 00:00:00 2001
From: Dmitry Artamonow <mad_soft@inbox.ru>
Date: Tue, 29 Sep 2009 06:12:37 +0100
Subject: [PATCH] --- yaml --- r: 166752 b: refs/heads/master c:
 6176d39471943a2e574782cbf62deded19b96aa0 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/kernel/entry-common.S | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 48421e178d3b..2315b1275e55 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca6cfa83463d1437895dc7e2e1b197e90dd07610
+refs/heads/master: 6176d39471943a2e574782cbf62deded19b96aa0
diff --git a/trunk/arch/arm/kernel/entry-common.S b/trunk/arch/arm/kernel/entry-common.S
index 807cfebb0f44..825db52e558a 100644
--- a/trunk/arch/arm/kernel/entry-common.S
+++ b/trunk/arch/arm/kernel/entry-common.S
@@ -126,7 +126,7 @@ ENTRY(__gnu_mcount_nc)
 	cmp r0, r2
 	bne gnu_trace
 	ldmia sp!, {r0-r3, ip, lr}
-	bx ip
+	mov pc, ip
 
 gnu_trace:
 	ldr r1, [sp, #20]			@ lr of instrumented routine
@@ -135,7 +135,7 @@ gnu_trace:
 	mov lr, pc
 	mov pc, r2
 	ldmia sp!, {r0-r3, ip, lr}
-	bx ip
+	mov pc, ip
 
 ENTRY(mcount)
 	stmdb sp!, {r0-r3, lr}