diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:27:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:27:12 -0400 |
| commit | d14b50cc60ca465290fcdb3b88e7d5fb684361ed (patch) | |
| tree | c4a712123b94cd4c0ab4d8d9d87a7619e9bcb6ba /arch/i386/kernel/traps.c | |
| parent | a34b6fc04d58ad72fe0cc74cd448f4551bd2ebaf (diff) | |
| parent | ef7d1b244fa6c94fb76d5f787b8629df64ea4046 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'arch/i386/kernel/traps.c')
| -rw-r--r-- | arch/i386/kernel/traps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c index 0d4005dc06c5..82e0fd02af1c 100644 --- a/arch/i386/kernel/traps.c +++ b/arch/i386/kernel/traps.c | |||
| @@ -454,7 +454,7 @@ void die(const char * str, struct pt_regs * regs, long err) | |||
| 454 | panic("Fatal exception in interrupt"); | 454 | panic("Fatal exception in interrupt"); |
| 455 | 455 | ||
| 456 | if (panic_on_oops) | 456 | if (panic_on_oops) |
| 457 | panic("Fatal exception: panic_on_oops"); | 457 | panic("Fatal exception"); |
| 458 | 458 | ||
| 459 | oops_exit(); | 459 | oops_exit(); |
| 460 | do_exit(SIGSEGV); | 460 | do_exit(SIGSEGV); |