summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2013-01-04 18:44:14 +0100
committerWill Deacon <will.deacon@arm.com>2013-01-10 22:08:51 +0100
commit6e484be1ccca3ea495db45900fd42aac8d49d754 (patch)
tree99c98c0d0fcf93bf70efb55dac0fe2e993a9317d /arch/arm
parentARM: virt: Avoid bx instruction for compatibility with <=ARMv4 (diff)
downloadlinux-6e484be1ccca3ea495db45900fd42aac8d49d754.tar.xz
linux-6e484be1ccca3ea495db45900fd42aac8d49d754.zip
ARM: virt: boot secondary CPUs through the right entry point
Secondary CPUs should use the __hyp_stub_install_secondary entry point, so boot mode inconsistencies can be detected. Cc: <stable@vger.kernel.org> Acked-by: Dave Martin <dave.martin@linaro.org> Reported-by: Ian Molton <ian.molton@collabora.co.uk> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/kernel/head.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 4eee351f4668..16abc8322f79 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -331,7 +331,7 @@ ENTRY(secondary_startup)
* as it has already been validated by the primary processor.
*/
#ifdef CONFIG_ARM_VIRT_EXT
- bl __hyp_stub_install
+ bl __hyp_stub_install_secondary
#endif
safe_svcmode_maskall r9