aboutsummaryrefslogtreecommitdiffstats
path: root/arch/parisc/kernel/traps.c
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2007-01-07 16:27:27 +0100
committerKyle McMartin <kyle@athena.road.mcmartin.ca>2007-02-17 01:04:13 -0500
commit0bbdac0897a48f415eb788bf3263c92bd5e97ffb (patch)
tree20692ef93d1a0995c3fe04e2d4536914a4a2c081 /arch/parisc/kernel/traps.c
parent[PARISC] Convert soft power switch driver to kthread (diff)
downloadlinux-dev-0bbdac0897a48f415eb788bf3263c92bd5e97ffb.tar.xz
linux-dev-0bbdac0897a48f415eb788bf3263c92bd5e97ffb.zip
[PARISC] detect recursive kernel crash earlier
Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to '')
-rw-r--r--arch/parisc/kernel/traps.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
index 7bf9e36f010d..1f62853e4c02 100644
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
@@ -255,8 +255,16 @@ KERN_CRIT " || ||\n");
printk(KERN_CRIT "%s (pid %d): %s (code %ld)\n",
current->comm, current->pid, str, err);
- dump_stack();
+ /* Wot's wrong wif bein' racy? */
+ if (current->thread.flags & PARISC_KERNEL_DEATH) {
+ printk(KERN_CRIT "%s() recursion detected.\n", __FUNCTION__);
+ local_irq_enable();
+ while (1);
+ }
+ current->thread.flags |= PARISC_KERNEL_DEATH;
+
show_regs(regs);
+ dump_stack();
if (in_interrupt())
panic("Fatal exception in interrupt");
@@ -267,14 +275,6 @@ KERN_CRIT " || ||\n");
panic("Fatal exception");
}
- /* Wot's wrong wif bein' racy? */
- if (current->thread.flags & PARISC_KERNEL_DEATH) {
- printk(KERN_CRIT "%s() recursion detected.\n", __FUNCTION__);
- local_irq_enable();
- while (1);
- }
-
- current->thread.flags |= PARISC_KERNEL_DEATH;
do_exit(SIGSEGV);
}