diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-31 01:45:48 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-31 01:45:48 -0400 |
| commit | aa43f77939c97bf9d3580c6a5e71a5a40290e451 (patch) | |
| tree | 095c0b8b3da4b6554a3f8ef4b39240a5d9216d4d /arch/powerpc/kernel/traps.c | |
| parent | 2818c5dec5e28d65d52afbb7695bbbafe6377ee5 (diff) | |
| parent | 4c15343167b5febe7bb0ba96aad5bef42ae94d3b (diff) | |
Merge branch 'merge'
Diffstat (limited to 'arch/powerpc/kernel/traps.c')
| -rw-r--r-- | arch/powerpc/kernel/traps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index 4d0b4e74d579..9b352bd0a460 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c | |||
| @@ -148,7 +148,7 @@ int die(const char *str, struct pt_regs *regs, long err) | |||
| 148 | panic("Fatal exception in interrupt"); | 148 | panic("Fatal exception in interrupt"); |
| 149 | 149 | ||
| 150 | if (panic_on_oops) | 150 | if (panic_on_oops) |
| 151 | panic("Fatal exception: panic_on_oops"); | 151 | panic("Fatal exception"); |
| 152 | 152 | ||
| 153 | do_exit(err); | 153 | do_exit(err); |
| 154 | 154 | ||