Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

[sfrench/cifs-2.6.git] / arch / arm64 / kernel / smp.c

diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index 03204e841172057f5093ccee5503e09fc1e872a1..defbab84e9e5c7968cabe030e28ef261c9507fb7 100644 (file)
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -223,7 +223,7 @@ asmlinkage notrace void secondary_start_kernel(void)
        if (system_uses_irq_prio_masking())
                init_gic_priority_masking();
 
-       rcu_cpu_starting(cpu);
+       rcutree_report_cpu_starting(cpu);
        trace_hardirqs_off();
 
        /*
@@ -409,7 +409,7 @@ void __noreturn cpu_die_early(void)
 
        /* Mark this CPU absent */
        set_cpu_present(cpu, 0);
-       rcu_report_dead(cpu);
+       rcutree_report_cpu_dead();
 
        if (IS_ENABLED(CONFIG_HOTPLUG_CPU)) {
                update_cpu_boot_status(CPU_KILL_ME);