aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/reboot.c
diff options
context:
space:
mode:
authorQais Yousef <qais.yousef@arm.com>2020-03-23 13:50:57 +0000
committerThomas Gleixner <tglx@linutronix.de>2020-03-25 12:59:32 +0100
commitdddf3578e0d497e66ebe654d0f3258ac20a07e27 (patch)
treed7dfba1cdfa66f528c1cee808077ff3dac69e025 /arch/arm/kernel/reboot.c
parentia64: Replace cpu_down() with smp_shutdown_nonboot_cpus() (diff)
downloadlinux-dev-dddf3578e0d497e66ebe654d0f3258ac20a07e27.tar.xz
linux-dev-dddf3578e0d497e66ebe654d0f3258ac20a07e27.zip
ARM: Don't use disable_nonboot_cpus()
disable_nonboot_cpus() is not safe to use when doing machine_down(), because it relies on freeze_secondary_cpus() which in turn is a suspend/resume related freeze and could abort if the logic detects any pending activities that can prevent finishing the offlining process. Beside disable_nonboot_cpus() is dependent on CONFIG_PM_SLEEP_SMP which is an othogonal config to rely on to ensure this function works correctly. Signed-off-by: Qais Yousef <qais.yousef@arm.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Russell King <linux@armlinux.org.uk> Link: https://lkml.kernel.org/r/20200323135110.30522-5-qais.yousef@arm.com
Diffstat (limited to 'arch/arm/kernel/reboot.c')
-rw-r--r--arch/arm/kernel/reboot.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/reboot.c b/arch/arm/kernel/reboot.c
index bb18ed0539f4..58ad1a70f770 100644
--- a/arch/arm/kernel/reboot.c
+++ b/arch/arm/kernel/reboot.c
@@ -88,11 +88,11 @@ void soft_restart(unsigned long addr)
* to execute e.g. a RAM-based pin loop is not sufficient. This allows the
* kexec'd kernel to use any and all RAM as it sees fit, without having to
* avoid any code or data used by any SW CPU pin loop. The CPU hotplug
- * functionality embodied in disable_nonboot_cpus() to achieve this.
+ * functionality embodied in smp_shutdown_nonboot_cpus() to achieve this.
*/
void machine_shutdown(void)
{
- disable_nonboot_cpus();
+ smp_shutdown_nonboot_cpus(0);
}
/*