diff options
| author | Dave Jones <davej@redhat.com> | 2006-09-05 17:16:33 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-09-05 17:16:33 -0400 |
| commit | 23e735bc7b0e1d614656881794257b4224efda3a (patch) | |
| tree | d9523b531156fedb204e31b4612519b0a7a003e7 /arch/ia64/kernel/traps.c | |
| parent | 3906f4edeef976c081c4e7bd92164d2f59c325ae (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge ../linus
Diffstat (limited to 'arch/ia64/kernel/traps.c')
| -rw-r--r-- | arch/ia64/kernel/traps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c index 5a0420464c6c..fffa9e0826bc 100644 --- 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) | |||
| 118 | spin_unlock_irq(&die.lock); | 118 | spin_unlock_irq(&die.lock); |
| 119 | 119 | ||
| 120 | if (panic_on_oops) | 120 | if (panic_on_oops) |
| 121 | panic("Fatal exception: panic_on_oops"); | 121 | panic("Fatal exception"); |
| 122 | 122 | ||
| 123 | do_exit(SIGSEGV); | 123 | do_exit(SIGSEGV); |
| 124 | } | 124 | } |