Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753808AbbBSWog (ORCPT ); Thu, 19 Feb 2015 17:44:36 -0500 Received: from mail-we0-f177.google.com ([74.125.82.177]:39959 "EHLO mail-we0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753775AbbBSWod (ORCPT ); Thu, 19 Feb 2015 17:44:33 -0500 From: Adrien Schildknecht To: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, x86@kernel.org, rostedt@goodmis.org, heukelum@fastmail.fm, luto@amacapital.net, adech.fo@gmail.com, masami.hiramatsu.pt@hitachi.com, akpm@linux-foundation.org, a.ryabinin@samsung.com, fruggeri@arista.com Cc: linux-kernel@vger.kernel.org, Adrien Schildknecht Subject: [PATCH 2/2] x86: fix output of show_trace_log_lvl() Date: Thu, 19 Feb 2015 23:43:16 +0100 Message-Id: <1424385796-28910-3-git-send-email-adrien+dev@schischi.me> X-Mailer: git-send-email 2.2.1 In-Reply-To: <1424385796-28910-1-git-send-email-adrien+dev@schischi.me> References: <1424385796-28910-1-git-send-email-adrien+dev@schischi.me> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1601 Lines: 47 Prepend the log level in printk_stack_address. Using printk with just a log level is ignored and thus has no effect on the next pr_cont. Signed-off-by: Adrien Schildknecht --- arch/x86/kernel/dumpstack.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c index cf3df1d..da1ab6a 100644 --- a/arch/x86/kernel/dumpstack.c +++ b/arch/x86/kernel/dumpstack.c @@ -25,10 +25,12 @@ unsigned int code_bytes = 64; int kstack_depth_to_print = 3 * STACKSLOTS_PER_LINE; static int die_counter; -static void printk_stack_address(unsigned long address, int reliable) +static void printk_stack_address(unsigned long address, int reliable, + void *data) { - pr_cont(" [<%p>] %s%pB\n", - (void *)address, reliable ? "" : "? ", (void *)address); + pr_cont("%s [<%p>] %s%pB\n", + (char *)data, (void *)address, reliable ? "" : "? ", + (void *)address); } void printk_address(unsigned long address) @@ -155,8 +157,7 @@ static int print_trace_stack(void *data, char *name) static void print_trace_address(void *data, unsigned long addr, int reliable) { touch_nmi_watchdog(); - printk(data); - printk_stack_address(addr, reliable); + printk_stack_address(addr, reliable, data); } static const struct stacktrace_ops print_trace_ops = { -- 2.2.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/