The following commit has been merged into the smp/core branch of tip: Commit-ID: 11ee270e3520129f977751e6174ebf8bf5f08a2f Gitweb: https://git.kernel.org/tip/11ee270e3520129f977751e6174ebf8bf5f08a2f Author: Qais Yousef <qais.yousef@xxxxxxx> AuthorDate: Mon, 23 Mar 2020 13:50:58 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitterDate: Wed, 25 Mar 2020 12:59:33 +01:00 ARM: Use reboot_cpu instead of hardcoding it to 0 Use `reboot_cpu` variable instead of hardcoding 0 as the reboot cpu in machine_shutdown(). Signed-off-by: Qais Yousef <qais.yousef@xxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Russell King <linux@xxxxxxxxxxxxxxx> Link: https://lkml.kernel.org/r/20200323135110.30522-6-qais.yousef@xxxxxxx --- arch/arm/kernel/reboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/kernel/reboot.c b/arch/arm/kernel/reboot.c index 58ad1a7..0ce388f 100644 --- a/arch/arm/kernel/reboot.c +++ b/arch/arm/kernel/reboot.c @@ -92,7 +92,7 @@ void soft_restart(unsigned long addr) */ void machine_shutdown(void) { - smp_shutdown_nonboot_cpus(0); + smp_shutdown_nonboot_cpus(reboot_cpu); } /*