Merge tag 'cpumask-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / arch / arm64 / kernel / smp.c

diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index 328b8ce..714411f 100644 (file)
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -151,6 +151,7 @@ asmlinkage void secondary_start_kernel(void)
         */
        cpu_set_reserved_ttbr0();
        flush_tlb_all();
+       cpu_set_default_tcr_t0sz();
 
        preempt_disable();
        trace_hardirqs_off();
@@ -309,7 +310,7 @@ void cpu_die(void)
 void __init smp_cpus_done(unsigned int max_cpus)
 {
        pr_info("SMP: Total of %d processors activated.\n", num_online_cpus());
-       apply_alternatives_all();
+       do_post_cpus_up_work();
 }
 
 void __init smp_prepare_boot_cpu(void)
@@ -635,7 +636,7 @@ void smp_send_stop(void)
                cpumask_t mask;
 
                cpumask_copy(&mask, cpu_online_mask);
-               cpu_clear(smp_processor_id(), mask);
+               cpumask_clear_cpu(smp_processor_id(), &mask);
 
                smp_cross_call(&mask, IPI_CPU_STOP);
        }