git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-fixes' into upstream
[pandora-kernel.git]
/
arch
/
xtensa
/
kernel
/
traps.c
diff --git
a/arch/xtensa/kernel/traps.c
b/arch/xtensa/kernel/traps.c
index
225d64d
..
9734960
100644
(file)
--- a/
arch/xtensa/kernel/traps.c
+++ b/
arch/xtensa/kernel/traps.c
@@
-461,7
+461,7
@@
void show_code(unsigned int *pc)
}
}
}
}
-
spinlock_t die_lock = SPIN_LOCK_UNLOCKED
;
+
DEFINE_SPINLOCK(die_lock)
;
void die(const char * str, struct pt_regs * regs, long err)
{
void die(const char * str, struct pt_regs * regs, long err)
{
@@
-487,11
+487,9
@@
void die(const char * str, struct pt_regs * regs, long err)
if (in_interrupt())
panic("Fatal exception in interrupt");
if (in_interrupt())
panic("Fatal exception in interrupt");
- if (panic_on_oops) {
- printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n");
- ssleep(5);
- panic("Fatal exception");
- }
+ if (panic_on_oops)
+ panic("Fatal exception: panic_on_oops");
+
do_exit(err);
}
do_exit(err);
}