Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 33352
b: refs/heads/master
c: 012c437
h: refs/heads/master
v: v3
  • Loading branch information
Horms authored and Greg Kroah-Hartman committed Aug 14, 2006
1 parent aa28863 commit c942733
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 485311a23c72c87332f9a55ce25e650e40ae3fc7
refs/heads/master: 012c437d03cb299814e58ac8d574f7510f5989a5
2 changes: 1 addition & 1 deletion trunk/arch/arm/kernel/traps.c
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ NORET_TYPE void die(const char *str, struct pt_regs *regs, int err)
spin_unlock_irq(&die_lock);

if (panic_on_oops)
panic("Fatal exception: panic_on_oops");
panic("Fatal exception");

do_exit(SIGSEGV);
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/i386/kernel/traps.c
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ void die(const char * str, struct pt_regs * regs, long err)
panic("Fatal exception in interrupt");

if (panic_on_oops)
panic("Fatal exception: panic_on_oops");
panic("Fatal exception");

oops_exit();
do_exit(SIGSEGV);
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/ia64/kernel/traps.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/powerpc/kernel/traps.c
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ int die(const char *str, struct pt_regs *regs, long err)
panic("Fatal exception in interrupt");

if (panic_on_oops)
panic("Fatal exception: panic_on_oops");
panic("Fatal exception");

do_exit(err);

Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/x86_64/kernel/traps.c
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ void __kprobes oops_end(unsigned long flags)
/* Nest count reaches zero, release the lock. */
spin_unlock_irqrestore(&die_lock, flags);
if (panic_on_oops)
panic("Fatal exception: panic_on_oops");
panic("Fatal exception");
}

void __kprobes __die(const char * str, struct pt_regs * regs, long err)
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/xtensa/kernel/traps.c
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ void die(const char * str, struct pt_regs * regs, long err)
panic("Fatal exception in interrupt");

if (panic_on_oops)
panic("Fatal exception: panic_on_oops");
panic("Fatal exception");

do_exit(err);
}
Expand Down

0 comments on commit c942733

Please sign in to comment.