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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
ia64
/
kernel
/
traps.c
diff --git
a/arch/ia64/kernel/traps.c
b/arch/ia64/kernel/traps.c
index
fffa9e0
..
dabd6c3
100644
(file)
--- a/
arch/ia64/kernel/traps.c
+++ b/
arch/ia64/kernel/traps.c
@@
-7,6
+7,7
@@
* 05/12/00 grao <goutham.rao@intel.com> : added isr in siginfo for SIGFPE
*/
* 05/12/00 grao <goutham.rao@intel.com> : added isr in siginfo for SIGFPE
*/
+#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/sched.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/sched.h>
@@
-29,19
+30,19
@@
extern spinlock_t timerlist_lock;
fpswa_interface_t *fpswa_interface;
EXPORT_SYMBOL(fpswa_interface);
fpswa_interface_t *fpswa_interface;
EXPORT_SYMBOL(fpswa_interface);
-
ATOMIC_NOTIFIER_HEAD(ia64die_chain)
;
+
struct notifier_block *ia64die_chain
;
int
register_die_notifier(struct notifier_block *nb)
{
int
register_die_notifier(struct notifier_block *nb)
{
- return
atomic_
notifier_chain_register(&ia64die_chain, nb);
+ return notifier_chain_register(&ia64die_chain, nb);
}
EXPORT_SYMBOL_GPL(register_die_notifier);
int
unregister_die_notifier(struct notifier_block *nb)
{
}
EXPORT_SYMBOL_GPL(register_die_notifier);
int
unregister_die_notifier(struct notifier_block *nb)
{
- return
atomic_
notifier_chain_unregister(&ia64die_chain, nb);
+ return notifier_chain_unregister(&ia64die_chain, nb);
}
EXPORT_SYMBOL_GPL(unregister_die_notifier);
}
EXPORT_SYMBOL_GPL(unregister_die_notifier);
@@
-117,8
+118,11
@@
die (const char *str, struct pt_regs *regs, long err)
die.lock_owner = -1;
spin_unlock_irq(&die.lock);
die.lock_owner = -1;
spin_unlock_irq(&die.lock);
- if (panic_on_oops)
+ if (panic_on_oops) {
+ printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n");
+ ssleep(5);
panic("Fatal exception");
panic("Fatal exception");
+ }
do_exit(SIGSEGV);
}
do_exit(SIGSEGV);
}