The following commit has been merged into the smp/core branch of tip: Commit-ID: 1e42176b4dac328b0be7075c2cebdf2006d31eb3 Gitweb: https://git.kernel.org/tip/1e42176b4dac328b0be7075c2cebdf2006d31eb3 Author: Qais Yousef <qais.yousef@xxxxxxx> AuthorDate: Mon, 23 Mar 2020 13:50:56 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitterDate: Wed, 25 Mar 2020 12:59:32 +01:00 ia64: Replace cpu_down() with smp_shutdown_nonboot_cpus() Use the new smp_shutdown_nonboot_cpus() instead of using cpu_down() directly. Use reboot_cpu instead of hardcoding the boot CPU to 0. This also prepares to make cpu_up/down() a private interface of the CPU subsystem. Signed-off-by: Qais Yousef <qais.yousef@xxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Tony Luck <tony.luck@xxxxxxxxx> Cc: Fenghua Yu <fenghua.yu@xxxxxxxxx> Link: https://lkml.kernel.org/r/20200323135110.30522-4-qais.yousef@xxxxxxx --- arch/ia64/kernel/process.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c index 968b5f3..bf4c0cd 100644 --- 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