The patch titled
panic_on_oops: remove ssleep()
has been added to the -mm tree. Its filename is
panic_on_oops-remove-ssleep.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: panic_on_oops: remove ssleep()
From: Horms <horms@xxxxxxxxxxxx>
This patch is part of an effort to unify the panic_on_oops behaviour across
all architectures that implement it.
It was pointed out to me by Andi Kleen that if an oops has occured in
interrupt context, then calling sleep() in the oops path will only cause a
panic, and that it would be really better for it not to be in the path at
all.
This patch removes the ssleep() call and reworks the console message
accordinly. I have a slght concern that the resulting console message is
too long, feedback welcome.
For powerpc it also unifies the 32bit and 64bit behaviour.
Fror x86_64, this patch only updates the console message, as ssleep() is
already not present.
Signed-off-by: Horms <horms@xxxxxxxxxxxx>
Acked-by: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Russell King <rmk@xxxxxxxxxxxxxxxx>
Cc: "Luck, Tony" <tony.luck@xxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxx>
Cc: Chris Zankel <chris@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/arm/kernel/traps.c | 7 ++-----
arch/i386/kernel/traps.c | 8 +++-----
arch/ia64/kernel/traps.c | 7 ++-----
arch/powerpc/kernel/traps.c | 10 +++-------
arch/x86_64/kernel/traps.c | 2 +-
arch/xtensa/kernel/traps.c | 8 +++-----
6 files changed, 14 insertions(+), 28 deletions(-)
diff -puN arch/arm/kernel/traps.c~panic_on_oops-remove-ssleep arch/arm/kernel/traps.c
--- a/arch/arm/kernel/traps.c~panic_on_oops-remove-ssleep
+++ a/arch/arm/kernel/traps.c
@@ -232,11 +232,8 @@ NORET_TYPE void die(const char *str, str
bust_spinlocks(0);
spin_unlock_irq(&die_lock);
- if (panic_on_oops) {
- printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n");
- ssleep(5);
- panic("Fatal exception");
- }
+ if (panic_on_oops)
+ panic("Fatal exception: panic_on_oops");
do_exit(SIGSEGV);
}
diff -puN arch/i386/kernel/traps.c~panic_on_oops-remove-ssleep arch/i386/kernel/traps.c
--- a/arch/i386/kernel/traps.c~panic_on_oops-remove-ssleep
+++ a/arch/i386/kernel/traps.c
@@ -447,11 +447,9 @@ void die(const char * str, struct pt_reg
if (in_interrupt())
panic("Fatal exception in interrupt");
- if (panic_on_oops) {
- printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n");
- ssleep(5);
- panic("Fatal exception");
- }
+ if (panic_on_oops)
+ panic("Fatal exception: panic_on_oops");
+
oops_exit();
do_exit(SIGSEGV);
}
diff -puN arch/ia64/kernel/traps.c~panic_on_oops-remove-ssleep arch/ia64/kernel/traps.c
--- a/arch/ia64/kernel/traps.c~panic_on_oops-remove-ssleep
+++ a/arch/ia64/kernel/traps.c
@@ -117,11 +117,8 @@ die (const char *str, struct pt_regs *re
die.lock_owner = -1;
spin_unlock_irq(&die.lock);
- if (panic_on_oops) {
- printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n");
- ssleep(5);
- panic("Fatal exception");
- }
+ if (panic_on_oops)
+ panic("Fatal exception: panic_on_oops");
do_exit(SIGSEGV);
}
diff -puN arch/powerpc/kernel/traps.c~panic_on_oops-remove-ssleep arch/powerpc/kernel/traps.c
--- a/arch/powerpc/kernel/traps.c~panic_on_oops-remove-ssleep
+++ a/arch/powerpc/kernel/traps.c
@@ -150,13 +150,9 @@ int die(const char *str, struct pt_regs
if (in_interrupt())
panic("Fatal exception in interrupt");
- if (panic_on_oops) {
-#ifdef CONFIG_PPC64
- printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n");
- ssleep(5);
-#endif
- panic("Fatal exception");
- }
+ if (panic_on_oops)
+ panic("Fatal exception: panic_on_oops");
+
do_exit(err);
return 0;
diff -puN arch/x86_64/kernel/traps.c~panic_on_oops-remove-ssleep arch/x86_64/kernel/traps.c
--- a/arch/x86_64/kernel/traps.c~panic_on_oops-remove-ssleep
+++ a/arch/x86_64/kernel/traps.c
@@ -529,7 +529,7 @@ void __kprobes oops_end(unsigned long fl
/* Nest count reaches zero, release the lock. */
spin_unlock_irqrestore(&die_lock, flags);
if (panic_on_oops)
- panic("Oops");
+ panic("Fatal exception: panic_on_oops");
}
void __kprobes __die(const char * str, struct pt_regs * regs, long err)
diff -puN arch/xtensa/kernel/traps.c~panic_on_oops-remove-ssleep arch/xtensa/kernel/traps.c
--- a/arch/xtensa/kernel/traps.c~panic_on_oops-remove-ssleep
+++ a/arch/xtensa/kernel/traps.c
@@ -487,11 +487,9 @@ void die(const char * str, struct pt_reg
if (in_interrupt())
panic("Fatal exception in interrupt");
- if (panic_on_oops) {
- printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n");
- ssleep(5);
- panic("Fatal exception");
- }
+ if (panic_on_oops)
+ panic("Fatal exception: panic_on_oops");
+
do_exit(err);
}
_
Patches currently in -mm which might be from horms@xxxxxxxxxxxx are
machine_kexecc-fix-the-description-of-segment-handling.patch
panic_on_oops-remove-ssleep.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
