Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8684014d authored by Stephen Boyd's avatar Stephen Boyd Committed by Russell King
Browse files

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: default avatarStephen Boyd <sboyd@codeaurora.org>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent bafe5865

arch/arm/mach-qcom/platsmp.c

+2 −2
Original line number Diff line number Diff line
@@ -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;