diff options
author | Marc Zyngier <marc.zyngier@arm.com> | 2013-01-04 12:44:14 -0500 |
---|---|---|
committer | Will Deacon <will.deacon@arm.com> | 2013-01-10 16:08:51 -0500 |
commit | 6e484be1ccca3ea495db45900fd42aac8d49d754 (patch) | |
tree | 99c98c0d0fcf93bf70efb55dac0fe2e993a9317d /arch/arm/kernel | |
parent | a4a12e008e292a81d312659529b71be2026ab355 (diff) |
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/kernel')
-rw-r--r-- | arch/arm/kernel/head.S | 2 |
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) | |||
331 | * as it has already been validated by the primary processor. | 331 | * as it has already been validated by the primary processor. |
332 | */ | 332 | */ |
333 | #ifdef CONFIG_ARM_VIRT_EXT | 333 | #ifdef CONFIG_ARM_VIRT_EXT |
334 | bl __hyp_stub_install | 334 | bl __hyp_stub_install_secondary |
335 | #endif | 335 | #endif |
336 | safe_svcmode_maskall r9 | 336 | safe_svcmode_maskall r9 |
337 | 337 | ||