From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758805AbcDAGhs (ORCPT ); Fri, 1 Apr 2016 02:37:48 -0400 Received: from terminus.zytor.com ([198.137.202.10]:32794 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754860AbcDAGhq (ORCPT ); Fri, 1 Apr 2016 02:37:46 -0400 Date: Thu, 31 Mar 2016 23:37:07 -0700 From: tip-bot for Rasmus Villemoes Message-ID: Cc: tglx@linutronix.de, jslaby@suse.cz, linux-kernel@vger.kernel.org, hpa@zytor.com, linux@rasmusvillemoes.dk, torvalds@linux-foundation.org, mingo@kernel.org, peterz@infradead.org Reply-To: mingo@kernel.org, torvalds@linux-foundation.org, peterz@infradead.org, linux@rasmusvillemoes.dk, hpa@zytor.com, tglx@linutronix.de, jslaby@suse.cz, linux-kernel@vger.kernel.org In-Reply-To: <1459024817-27122-1-git-send-email-linux@rasmusvillemoes.dk> References: <1459024817-27122-1-git-send-email-linux@rasmusvillemoes.dk> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/debug] x86/dumpstack: Combine some printk()s Git-Commit-ID: 8fad7ec51e1b9e262e0bdd34e800ac1ea5e84dec X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 8fad7ec51e1b9e262e0bdd34e800ac1ea5e84dec Gitweb: http://git.kernel.org/tip/8fad7ec51e1b9e262e0bdd34e800ac1ea5e84dec Author: Rasmus Villemoes AuthorDate: Sat, 26 Mar 2016 21:40:16 +0100 Committer: Ingo Molnar CommitDate: Thu, 31 Mar 2016 15:33:03 +0200 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: Rasmus Villemoes Cc: Jiri Slaby Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1459024817-27122-1-git-send-email-linux@rasmusvillemoes.dk Signed-off-by: Ingo Molnar --- arch/x86/kernel/dumpstack.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c index 8efa57a..2bb25c3 100644 --- a/arch/x86/kernel/dumpstack.c +++ b/arch/x86/kernel/dumpstack.c @@ -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;