From c33cddffbda779d74c6ee21fbfa1fac5bc08fa79 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Fri, 26 Aug 2011 16:32:57 +0100
Subject: [PATCH] --- yaml --- r: 263589 b: refs/heads/master c:
 552e0c8da8ff7099e6fe060cd7ec36ae11f5465b h: refs/heads/master i:   263587:
 1f9a4a97c6ebe7fecd786870e4310f8ad89ae0ac v: v3

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

diff --git a/[refs] b/[refs]
index 689d5a8e6ee3..396d7ebaed98 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ebb962e00a52b644433065d224ed89f72a84756
+refs/heads/master: 552e0c8da8ff7099e6fe060cd7ec36ae11f5465b
diff --git a/trunk/arch/arm/kernel/relocate_kernel.S b/trunk/arch/arm/kernel/relocate_kernel.S
index 9cf4cbf8f95b..d0cdedf4864d 100644
--- a/trunk/arch/arm/kernel/relocate_kernel.S
+++ b/trunk/arch/arm/kernel/relocate_kernel.S
@@ -57,7 +57,8 @@ relocate_new_kernel:
 	mov r0,#0
 	ldr r1,kexec_mach_type
 	ldr r2,kexec_boot_atags
-	mov pc,lr
+ ARM(	mov pc, lr	)
+ THUMB(	bx lr		)
 
 	.align