Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fad7ec5 authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Ingo Molnar
Browse files

x86/dumpstack: Combine some printk()s 



Long ago, Jiri Slaby noted that the subsequent printk()s should be
pr_cont(). Let's instead get rid of the multiple printk calls.

Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1459024817-27122-1-git-send-email-linux@rasmusvillemoes.dk


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 1e6d88cc

arch/x86/kernel/dumpstack.c

+6 −13
Original line number Diff line number Diff line
@@ -260,19 +260,12 @@ int __die(const char *str, struct pt_regs *regs, long err) 
	unsigned long sp;

#endif

	printk(KERN_DEFAULT

	       "%s: %04lx [#%d] ", str, err & 0xffff, ++die_counter);

#ifdef CONFIG_PREEMPT

	printk("PREEMPT ");

#endif

#ifdef CONFIG_SMP

	printk("SMP ");

#endif

	if (debug_pagealloc_enabled())

		printk("DEBUG_PAGEALLOC ");

#ifdef CONFIG_KASAN

	printk("KASAN");

#endif

	printk("\n");

	       "%s: %04lx [#%d]%s%s%s%s\n", str, err & 0xffff, ++die_counter,

	       IS_ENABLED(CONFIG_PREEMPT) ? " PREEMPT"         : "",

	       IS_ENABLED(CONFIG_SMP)     ? " SMP"             : "",

	       debug_pagealloc_enabled()  ? " DEBUG_PAGEALLOC" : "",

	       IS_ENABLED(CONFIG_KASAN)   ? " KASAN"           : "");



	if (notify_die(DIE_OOPS, str, regs, err,

			current->thread.trap_nr, SIGSEGV) == NOTIFY_STOP)

		return 1;