summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2015-01-31 00:25:31 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2015-02-10 10:23:14 +0000
commit8684014d71e259f62f7dc24a20324e232806b2ef (patch)
tree41d5815ab4a03294486145e07987a693ed6bf523
parentbafe5865834c0cc0d0f937deecc275ccdd588ce8 (diff)
downloadop-kernel-dev-8684014d71e259f62f7dc24a20324e232806b2ef.zip
op-kernel-dev-8684014d71e259f62f7dc24a20324e232806b2ef.tar.gz
ARM: 8301/1: qcom: Use secondary_startup_arm()
On qcom platforms we always enter the kernel in ARM mode, regardless of the kernel being compiled for THUMB mode. Use secondary_startup_arm() to properly switch the mode to what the kernel expects if required. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-qcom/platsmp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-qcom/platsmp.c b/arch/arm/mach-qcom/platsmp.c
index d690856..09cffed 100644
--- a/arch/arm/mach-qcom/platsmp.c
+++ b/arch/arm/mach-qcom/platsmp.c
@@ -44,7 +44,7 @@
#define APCS_SAW2_VCTL 0x14
#define APCS_SAW2_2_VCTL 0x1c
-extern void secondary_startup(void);
+extern void secondary_startup_arm(void);
static DEFINE_SPINLOCK(boot_lock);
@@ -337,7 +337,7 @@ static void __init qcom_smp_prepare_cpus(unsigned int max_cpus)
flags |= cold_boot_flags[map];
}
- if (scm_set_boot_addr(virt_to_phys(secondary_startup), flags)) {
+ if (scm_set_boot_addr(virt_to_phys(secondary_startup_arm), flags)) {
for_each_present_cpu(cpu) {
if (cpu == smp_processor_id())
continue;
OpenPOWER on IntegriCloud