summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/traps.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2006-08-18 18:20:04 +0200
committerGreg Kroah-Hartman2006-08-18 18:20:04 +0200
commited0da6fc9d3096f54c4a76737eeae57ac81418cf (patch)
tree3bf45a192d991c5a5c80ac86eb333f9a4f796044 /arch/powerpc/kernel/traps.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-2.6.18 (diff)
parent[POWERPC] Fix the mpc8641_hpcn.dts file. (diff)
downloadkernel-qcow2-linux-ed0da6fc9d3096f54c4a76737eeae57ac81418cf.tar.gz
kernel-qcow2-linux-ed0da6fc9d3096f54c4a76737eeae57ac81418cf.tar.xz
kernel-qcow2-linux-ed0da6fc9d3096f54c4a76737eeae57ac81418cf.zip
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
Diffstat (limited to 'arch/powerpc/kernel/traps.c')
-rw-r--r--arch/powerpc/kernel/traps.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 05682a24b210..e4d1713e8aea 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -55,9 +55,6 @@
#ifdef CONFIG_PPC64 /* XXX */
#define _IO_BASE pci_io_base
-#ifdef CONFIG_KEXEC
-cpumask_t cpus_in_sr = CPU_MASK_NONE;
-#endif
#endif
#ifdef CONFIG_DEBUGGER
@@ -211,6 +208,19 @@ void system_reset_exception(struct pt_regs *regs)
die("System Reset", regs, SIGABRT);
+ /*
+ * Some CPUs when released from the debugger will execute this path.
+ * These CPUs entered the debugger via a soft-reset. If the CPU was
+ * hung before entering the debugger it will return to the hung
+ * state when exiting this function. This causes a problem in
+ * kdump since the hung CPU(s) will not respond to the IPI sent
+ * from kdump. To prevent the problem we call crash_kexec_secondary()
+ * here. If a kdump had not been initiated or we exit the debugger
+ * with the "exit and recover" command (x) crash_kexec_secondary()
+ * will return after 5ms and the CPU returns to its previous state.
+ */
+ crash_kexec_secondary(regs);
+
/* Must die if the interrupt is not recoverable */
if (!(regs->msr & MSR_RI))
panic("Unrecoverable System Reset");