Commit 6e6f0a1f authored Jan 12, 2012 by Andi Kleen Committed by Linus Torvalds Jan 12, 2012

panic: don't print redundant backtraces on oops



When an oops causes a panic and panic prints another backtrace it's pretty
common to have the original oops data be scrolled away on a 80x50 screen.

The second backtrace is quite redundant and not needed anyways.

So don't print the panic backtrace when oops_in_progress is true.

[akpm@linux-foundation.org: add comment]
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent b8f566b0

kernel/panic.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -94,6 +94,10 @@ void panic(const char *fmt, ...)
		va_end(args);
		printk(KERN_EMERG "Kernel panic - not syncing: %s\n",buf);
		#ifdef CONFIG_DEBUG_BUGVERBOSE
		/*
		* Avoid nested stack-dumping if a panic occurs during oops processing
		*/
		if (!oops_in_progress)
		dump_stack();
		#endif

Admin message