From: Will Deacon <will.deacon@arm.com>
Date: Fri, 26 Aug 2011 15:32:57 +0000 (+0100)
Subject: ARM: 7065/1: kexec: ensure new kernel is entered in ARM state
X-Git-Tag: v3.1-rc5~9^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=552e0c8da8ff7099e6fe060cd7ec36ae11f5465b;p=pandora-kernel.git

ARM: 7065/1: kexec: ensure new kernel is entered in ARM state

Commit 540b5738 ("ARM: 6999/1: head, zImage: Always Enter the kernel in
ARM state") mandates that the kernel should be entered in ARM state.

If a Thumb-2 kernel kexecs a new kernel image, we need to ensure that
we change state when branching to the new code. This patch replaces a
mov pc, lr with a bx lr on Thumb-2 kernels so that we transition to ARM
state if need be.

Reviewed-by: Dave Martin <dave.martin@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

Reading git-diff-tree failed