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>
This commit is contained in:
Stephen Boyd 2015-01-31 00:25:31 +01:00 коммит произвёл Russell King
Родитель bafe586583
Коммит 8684014d71
1 изменённых файлов: 2 добавлений и 2 удалений

Просмотреть файл

@ -44,7 +44,7 @@
#define APCS_SAW2_VCTL 0x14 #define APCS_SAW2_VCTL 0x14
#define APCS_SAW2_2_VCTL 0x1c #define APCS_SAW2_2_VCTL 0x1c
extern void secondary_startup(void); extern void secondary_startup_arm(void);
static DEFINE_SPINLOCK(boot_lock); 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]; 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) { for_each_present_cpu(cpu) {
if (cpu == smp_processor_id()) if (cpu == smp_processor_id())
continue; continue;