summaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/crash.c
diff options
context:
space:
mode:
authorDengcheng Zhu <dzhu@wavecomp.com>2018-09-11 14:49:21 -0700
committerPaul Burton <paul.burton@mips.com>2018-09-22 10:31:50 -0700
commit62cac480f33f8f9413d609cb1601b0ee521a86b8 (patch)
tree92d3e1e0e580cbc175cd27b77b0ddf7c931ac338 /arch/mips/kernel/crash.c
parentdc57aaf95a516f70e2d527d8287a0332c481a226 (diff)
downloadlinux-62cac480f33f8f9413d609cb1601b0ee521a86b8.tar.bz2
MIPS: kexec: Make a framework for both jumping and halting on nonboot CPUs
The existing implementation lets machine_kexec() CPU jump to reboot code buffer, whereas other CPUs to relocated_kexec_smp_wait. The natural way to bring up an SMP new kernel would be to let CPU0 do it while others being halted. For those failing to do so, fall back to the jumping method. Signed-off-by: Dengcheng Zhu <dzhu@wavecomp.com> [paul.burton@mips.com: Guard kexec_nonboot_cpu_jump with CONFIG_SMP] Signed-off-by: Paul Burton <paul.burton@mips.com> Patchwork: https://patchwork.linux-mips.org/patch/20570/ Cc: pburton@wavecomp.com Cc: ralf@linux-mips.org Cc: linux-mips@linux-mips.org Cc: rachel.mozes@intel.com
Diffstat (limited to 'arch/mips/kernel/crash.c')
-rw-r--r--arch/mips/kernel/crash.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/mips/kernel/crash.c b/arch/mips/kernel/crash.c
index 4c07a43a3242..2c7288041a99 100644
--- a/arch/mips/kernel/crash.c
+++ b/arch/mips/kernel/crash.c
@@ -46,7 +46,9 @@ static void crash_shutdown_secondary(void *passed_regs)
while (!atomic_read(&kexec_ready_to_reboot))
cpu_relax();
- relocated_kexec_smp_wait(NULL);
+
+ kexec_reboot();
+
/* NOTREACHED */
}