From: Shawn Guo Date: Fri, 5 Oct 2012 00:12:23 +0000 (-0700) Subject: kernel/sys.c: call disable_nonboot_cpus() in kernel_restart() X-Git-Tag: Ubuntu-5.0.0-8.9~15140^2~142 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f96972f2dc6365421cf2366ebd61ee4cf060c8d5;p=mirror_ubuntu-disco-kernel.git kernel/sys.c: call disable_nonboot_cpus() in kernel_restart() As kernel_power_off() calls disable_nonboot_cpus(), we may also want to have kernel_restart() call disable_nonboot_cpus(). Doing so can help machines that require boot cpu be the last alive cpu during reboot to survive with kernel restart. This fixes one reboot issue seen on imx6q (Cortex-A9 Quad). The machine requires that the restart routine be run on the primary cpu rather than secondary ones. Otherwise, the secondary core running the restart routine will fail to come to online after reboot. Signed-off-by: Shawn Guo Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/kernel/sys.c b/kernel/sys.c index f9492284e5d2..fdad206165d0 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -368,6 +368,7 @@ EXPORT_SYMBOL(unregister_reboot_notifier); void kernel_restart(char *cmd) { kernel_restart_prepare(cmd); + disable_nonboot_cpus(); if (!cmd) printk(KERN_EMERG "Restarting system.\n"); else