From: dave.martin@linaro.org (Dave Martin)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/4] ARM: zImage: Jump to the decompressed kernel entry point in ARM state
Date: Mon, 20 Jun 2011 14:40:28 +0100 [thread overview]
Message-ID: <1308577229-23681-4-git-send-email-dave.martin@linaro.org> (raw)
In-Reply-To: <1308577229-23681-1-git-send-email-dave.martin@linaro.org>
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@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
next prev parent reply other threads:[~2011-06-20 13:40 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-20 13:40 [PATCH 0/4] Consistently enter the kernel in ARM state Dave Martin
2011-06-20 13:40 ` [PATCH 1/4] ARM: head: Always Enter " Dave Martin
2011-06-20 13:40 ` [PATCH 2/4] ARM: head-nommu: Always enter " Dave Martin
2011-06-20 13:40 ` Dave Martin [this message]
2011-06-20 13:40 ` [PATCH 4/4] ARM: Documentation: clarify entry requirements for ARM versus Thumb-2 Dave Martin
2011-06-20 14:01 ` [PATCH 0/4] Consistently enter the kernel in ARM state Nicolas Pitre
2011-06-20 14:17 ` Dave Martin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1308577229-23681-4-git-send-email-dave.martin@linaro.org \
--to=dave.martin@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).