Merge tag 'smp-core-2020-03-30' of git://git.kernel.org/pub/scm/linux/kernel/git...

[platform/kernel/linux-rpi.git] / arch / ia64 / kernel / process.c

diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index 968b5f3..10cb938 100644 (file)
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -646,14 +646,8 @@ cpu_halt (void)
 
 void machine_shutdown(void)
 {
-#ifdef CONFIG_HOTPLUG_CPU
-       int cpu;
+       smp_shutdown_nonboot_cpus(reboot_cpu);
 
-       for_each_online_cpu(cpu) {
-               if (cpu != smp_processor_id())
-                       cpu_down(cpu);
-       }
-#endif
 #ifdef CONFIG_KEXEC
        kexec_disable_iosapic();
 #endif
@@ -681,3 +675,4 @@ machine_power_off (void)
        machine_halt();
 }
 
+EXPORT_SYMBOL(ia64_delay_loop);