From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753337AbbJFVGK (ORCPT ); Tue, 6 Oct 2015 17:06:10 -0400 Received: from mail-la0-f51.google.com ([209.85.215.51]:33386 "EHLO mail-la0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753238AbbJFVGF (ORCPT ); Tue, 6 Oct 2015 17:06:05 -0400 From: Rasmus Villemoes To: Paul Gortmaker , Jiri Slaby , Ingo Molnar , Andrew Morton , Thomas Gleixner , "H. Peter Anvin" , Michal Marek Cc: Rasmus Villemoes , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] x86: dumpstack: eliminate some #ifdefs Date: Tue, 6 Oct 2015 23:05:43 +0200 Message-Id: <1444165543-2209-2-git-send-email-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1444165543-2209-1-git-send-email-linux@rasmusvillemoes.dk> References: <5613F3DE.4010406@suse.cz> <1444165543-2209-1-git-send-email-linux@rasmusvillemoes.dk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Jiri Slaby noted that these #ifdef protected printks should really be pr_cont. However, we might as well get completely rid of both the multiple printk calls and the tiny #ifdef sections by just building an appropriate string and passing that to the first printk call. Signed-off-by: Rasmus Villemoes --- Mostly an example of how 1/2 can be used. arch/x86/kernel/dumpstack.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c index 9c30acfadae2..6ae7e65e734e 100644 --- a/arch/x86/kernel/dumpstack.c +++ b/arch/x86/kernel/dumpstack.c @@ -257,21 +257,16 @@ int __die(const char *str, struct pt_regs *regs, long err) unsigned short ss; unsigned long sp; #endif + static const char build_flags[] = "" + CHOOSE_EXPR(CONFIG_PREEMPT, " PREEMPT") + CHOOSE_EXPR(CONFIG_SMP, " SMP") + CHOOSE_EXPR(CONFIG_DEBUG_PAGEALLOC, " DEBUG_PAGEALLOC") + CHOOSE_EXPR(CONFIG_KASAN, " KASAN"); + printk(KERN_DEFAULT - "%s: %04lx [#%d] ", str, err & 0xffff, ++die_counter); -#ifdef CONFIG_PREEMPT - printk("PREEMPT "); -#endif -#ifdef CONFIG_SMP - printk("SMP "); -#endif -#ifdef CONFIG_DEBUG_PAGEALLOC - printk("DEBUG_PAGEALLOC "); -#endif -#ifdef CONFIG_KASAN - printk("KASAN"); -#endif - printk("\n"); + "%s: %04lx [#%d]%s\n", str, err & 0xffff, ++die_counter, + build_flags); + if (notify_die(DIE_OOPS, str, regs, err, current->thread.trap_nr, SIGSEGV) == NOTIFY_STOP) return 1; -- 2.1.3