git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.7-1.492
[linux-2.6.git]
/
arch
/
ia64
/
kernel
/
traps.c
diff --git
a/arch/ia64/kernel/traps.c
b/arch/ia64/kernel/traps.c
index
f899131
..
e0a9fcd
100644
(file)
--- a/
arch/ia64/kernel/traps.c
+++ b/
arch/ia64/kernel/traps.c
@@
-92,6
+92,13
@@
die (const char *str, struct pt_regs *regs, long err)
} else
printk(KERN_ERR "Recursive die() failure, output suppressed\n");
} else
printk(KERN_ERR "Recursive die() failure, output suppressed\n");
+ if (netdump_func)
+ netdump_func(regs);
+ if (panic_on_oops) {
+ if (netdump_func)
+ netdump_func = NULL;
+ panic("Fatal exception");
+ }
bust_spinlocks(0);
die.lock_owner = -1;
spin_unlock_irq(&die.lock);
bust_spinlocks(0);
die.lock_owner = -1;
spin_unlock_irq(&die.lock);