[PATCH 3/4] ARM: zImage: Jump to the decompressed kernel entry point in ARM state

Dave Martin dave.martin at linaro.org
Mon Jun 20 09:40:28 EDT 2011


This change is required in order to enter the kernel correctly
now that the main kernel entry point expects to be called in
ARM state.

Signed-off-by: Dave Martin <dave.martin at linaro.org>
---
 arch/arm/boot/compressed/head.S |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index f9da419..51af709 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -353,7 +353,8 @@ not_relocated:	mov	r0, #0
 		mov	r0, #0			@ must be zero
 		mov	r1, r7			@ restore architecture number
 		mov	r2, r8			@ restore atags pointer
-		mov	pc, r4			@ call kernel
+ ARM(		mov	pc, r4	)		@ call kernel
+ THUMB(		bx	r4	)		@ entry point is always ARM
 
 		.align	2
 		.type	LC0, #object
-- 
1.7.4.1




More information about the linux-arm-kernel mailing list