diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:25:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:25:47 -0400 |
| commit | 49666145de54b5d6d256442bb1bec03ffae1ac76 (patch) | |
| tree | b79bcaabffa18847cab31efdf798dc5740e8d73b /arch/xtensa/kernel/traps.c | |
| parent | bcd68373877e74d8ca5039c10dc5d699ba5dc7d0 (diff) | |
| parent | 41ace1861a93f12f70ff10026fb1539fea38fcf8 (diff) | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'arch/xtensa/kernel/traps.c')
| -rw-r--r-- | arch/xtensa/kernel/traps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c index 9734960a2451..ce077d6bf3a0 100644 --- a/arch/xtensa/kernel/traps.c +++ b/arch/xtensa/kernel/traps.c | |||
| @@ -488,7 +488,7 @@ void die(const char * str, struct pt_regs * regs, long err) | |||
| 488 | panic("Fatal exception in interrupt"); | 488 | panic("Fatal exception in interrupt"); |
| 489 | 489 | ||
| 490 | if (panic_on_oops) | 490 | if (panic_on_oops) |
| 491 | panic("Fatal exception: panic_on_oops"); | 491 | panic("Fatal exception"); |
| 492 | 492 | ||
| 493 | do_exit(err); | 493 | do_exit(err); |
| 494 | } | 494 | } |