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 tag 'r8169-20060920-00' of git://electric-eye.fr.zoreil.com/home/romieu/linux...
[pandora-kernel.git]
/
arch
/
ia64
/
kernel
/
traps.c
diff --git
a/arch/ia64/kernel/traps.c
b/arch/ia64/kernel/traps.c
index
5a04204
..
fffa9e0
100644
(file)
--- a/
arch/ia64/kernel/traps.c
+++ b/
arch/ia64/kernel/traps.c
@@
-118,7
+118,7
@@
die (const char *str, struct pt_regs *regs, long err)
spin_unlock_irq(&die.lock);
if (panic_on_oops)
- panic("Fatal exception
: panic_on_oops
");
+ panic("Fatal exception");
do_exit(SIGSEGV);
}