---

yaml --- r: 263589 b: refs/heads/master c: 552e0c8 h: refs/heads/master i: 263587: 1f9a4a9 v: v3
git-mirror · Aug 28, 2011 · c33cddf · c33cddf
1 parent aeb2bf8
commit c33cddf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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