Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-qcom / platsmp.c

diff --git a/arch/arm/mach-qcom/platsmp.c b/arch/arm/mach-qcom/platsmp.c
index d6908569ecaf145815338c4f2073240c3ef5efee..09cffed4c0a445784371cf493a4e210b1b261c89 100644 (file)
--- 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;