Skip to content

Commit

Permalink
ARM: 8301/1: qcom: Use secondary_startup_arm()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Stephen Boyd authored and Russell King committed Feb 10, 2015
1 parent bafe586 commit 8684014
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/arm/mach-qcom/platsmp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 8684014

Please sign in to comment.